projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[linux-2.6-block.git]
/
drivers
/
net
/
wireless
/
orinoco
/
wext.c
diff --git
a/drivers/net/wireless/orinoco/wext.c
b/drivers/net/wireless/orinoco/wext.c
index 8e65ffc4cb0a03b2d7ce91cc702c1657b3520340..e793679e2e190c9321d863512e0756fbaa17713b 100644
(file)
--- a/
drivers/net/wireless/orinoco/wext.c
+++ b/
drivers/net/wireless/orinoco/wext.c
@@
-919,10
+919,10
@@
static int orinoco_ioctl_set_auth(struct net_device *dev,
*/
if (param->value) {
priv->tkip_cm_active = 1;
- ret = hermes_
en
able_port(hw, 0);
+ ret = hermes_
dis
able_port(hw, 0);
} else {
priv->tkip_cm_active = 0;
- ret = hermes_
dis
able_port(hw, 0);
+ ret = hermes_
en
able_port(hw, 0);
}
break;