diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-12-08 16:23:31 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-12-08 16:23:31 -0500 |
| commit | 393934c6b5c8d00f9d1ae20670d4a770f07a418a (patch) | |
| tree | dad33cd2e4fc0e3d3b28dcbc36cfb44178cb046c /drivers/net/wireless/orinoco/wext.c | |
| parent | 69f4aab1157d2a386e7ea4de77cc253629d1b4f2 (diff) | |
| parent | 0a54917c3fc295cb61f3fb52373c173fd3b69f48 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/ath/ath9k/ath9k.h
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/ath/ath9k/xmit.c
Diffstat (limited to 'drivers/net/wireless/orinoco/wext.c')
| -rw-r--r-- | drivers/net/wireless/orinoco/wext.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/orinoco/wext.c b/drivers/net/wireless/orinoco/wext.c index 8e65ffc4cb0a..e793679e2e19 100644 --- 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_enable_port(hw, 0); + ret = hermes_disable_port(hw, 0); } else { priv->tkip_cm_active = 0; - ret = hermes_disable_port(hw, 0); + ret = hermes_enable_port(hw, 0); } break; |