]> err.no Git - linux-2.6/commitdiff
mac80211: silently accept deletion of non-existant key
authorJohn W. Linville <linville@linville-t41.local>
Tue, 25 Mar 2008 15:43:15 +0000 (11:43 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 27 Mar 2008 19:51:20 +0000 (15:51 -0400)
Otherwise, 'iwconfig wlan0 key off' with no key set results in:

Error for wireless request "Set Encode" (8B2A) :
    SET failed on device wlan0 ; No such file or directory.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/mac80211/ieee80211_ioctl.c

index 5af23d31872692ee9961a5667646aa1260c9c510..b047eebb6330b52ae567312ef6b6d7ab29678cbc 100644 (file)
@@ -55,9 +55,6 @@ static int ieee80211_set_encryption(struct net_device *dev, u8 *sta_addr,
                        key = sta->key;
                }
 
-               if (!key)
-                       return -ENOENT;
-
                ieee80211_key_free(key);
                return 0;
        } else {