projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6
[powerpc.git]
/
drivers
/
net
/
wireless
/
hostap
/
hostap_ioctl.c
diff --git
a/drivers/net/wireless/hostap/hostap_ioctl.c
b/drivers/net/wireless/hostap/hostap_ioctl.c
index
f3e0ce1
..
8b37e82
100644
(file)
--- a/
drivers/net/wireless/hostap/hostap_ioctl.c
+++ b/
drivers/net/wireless/hostap/hostap_ioctl.c
@@
-3358,10
+3358,6
@@
static int prism2_ioctl_siwencodeext(struct net_device *dev,
if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) {
if (!sta_ptr)
local->tx_keyidx = i;
- else if (i) {
- ret = -EINVAL;
- goto done;
- }
}