Staging: wlan-ng: p80211wext don't set default key id twice
authorRichard Kennedy <richard@rsk.demon.co.uk>
Mon, 3 Nov 2008 11:21:30 +0000 (11:21 +0000)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 6 Jan 2009 21:52:00 +0000 (13:52 -0800)
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>
drivers/staging/wlan-ng/p80211wext.c

index c795a36ad6ff73ba83234a59b36be08391a82ab6..affba765bdf81c480a85d63da2e607c47c4bd213 100644 (file)
@@ -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);