From 486d56061964b38300d98c84fd1c58a6e7db0cd0 Mon Sep 17 00:00:00 2001 From: Zhu Yi Date: Thu, 13 Apr 2006 17:21:13 +0800 Subject: [PATCH] --- yaml --- r: 27301 b: refs/heads/master c: e3c5a64e7075dd066316f1685caadabcbc649427 h: refs/heads/master i: 27299: 25229dcac14bbe3d39ef9a27a2fa54408d0d1f17 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ipw2200.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0b5343e70319..6fb4ea17e8cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 127119d50ff6e226c602ae920722897f8a0c81e2 +refs/heads/master: e3c5a64e7075dd066316f1685caadabcbc649427 diff --git a/trunk/drivers/net/wireless/ipw2200.c b/trunk/drivers/net/wireless/ipw2200.c index 0f81ff7a1cd6..39f82f219749 100644 --- a/trunk/drivers/net/wireless/ipw2200.c +++ b/trunk/drivers/net/wireless/ipw2200.c @@ -6344,8 +6344,6 @@ static void ipw_wpa_assoc_frame(struct ipw_priv *priv, char *wpa_ie, { /* make sure WPA is enabled */ ipw_wpa_enable(priv, 1); - - ipw_disassociate(priv); } static int ipw_set_rsn_capa(struct ipw_priv *priv, @@ -6539,6 +6537,7 @@ static int ipw_wx_set_auth(struct net_device *dev, case IW_AUTH_WPA_ENABLED: ret = ipw_wpa_enable(priv, param->value); + ipw_disassociate(priv); break; case IW_AUTH_RX_UNENCRYPTED_EAPOL: