cfg80211: wext: only allow WEP keys to be configured before connected

When not connected, anything but WEP keys shouldn't be allowed to be
configured for later - only static WEP keys make sense at this point.
Change wext to reject anything else just like nl80211 does.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index 9f27221c89135d5d54b814baf26378c599d95ac2..e45a76449b437eae90b3fb213d728ab3793a5ad1 100644 (file)
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -487,6 +487,9 @@ static int __cfg80211_set_encryption(struct cfg80211_registered_device *rdev,
        err = 0;
        if (wdev->current_bss)
                err = rdev_add_key(rdev, dev, idx, pairwise, addr, params);
+       else if (params->cipher != WLAN_CIPHER_SUITE_WEP40 &&
+                params->cipher != WLAN_CIPHER_SUITE_WEP104)
+               return -EINVAL;
        if (err)
                return err;