From: Richard Kennedy <richard@rsk.demon.co.uk>
Date: Mon, 3 Nov 2008 11:21:30 +0000 (+0000)
Subject: Staging: wlan-ng: p80211wext don't set default key id twice
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=87b3df81fcee640952bd7c038b33488af4ee2bc7;p=deliverable%2Flinux.git

Staging: wlan-ng: p80211wext don't set default key id twice

p80211wext don't set default key id twice

another change from wlan-ng-devel

Signed-off-by: Richard Kennedy <richard@rsk.demon.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/wlan-ng/p80211wext.c b/drivers/staging/wlan-ng/p80211wext.c
index c795a36ad6ff..affba765bdf8 100644
--- a/drivers/staging/wlan-ng/p80211wext.c
+++ b/drivers/staging/wlan-ng/p80211wext.c
@@ -611,13 +611,6 @@ static int p80211wext_siwencode(netdevice_t *dev,
 		else
 			i--;
 
-		result = p80211wext_dorequest(wlandev, DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID, i);
-
-		if (result) {
-			err = -EFAULT;
-			goto exit;
-		}
-
 		/* Set current key number only if no keys are given */
 		if (erq->flags & IW_ENCODE_NOKEY) {
 			result = p80211wext_dorequest(wlandev, DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID, i);