cfg80211: Add support for static WEP in the driver

Add support for drivers that implement static WEP internally, i.e.
expose connection keys to the driver in connect flow and don't
upload the keys after the connection.

Signed-off-by: David Spinadel <david.spinadel@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

6 files changed, 13 insertions, 8 deletions

diff --git a/net/wireless/core.h b/net/wireless/core.h
index 5555e3c13ae9..554f87d0f991 100644
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -249,8 +249,8 @@ struct cfg80211_event {
 };
 
 struct cfg80211_cached_keys {
-        struct key_params params[4];
-        u8 data[4][WLAN_KEY_LEN_WEP104];
+        struct key_params params[CFG80211_MAX_WEP_KEYS];
+        u8 data[CFG80211_MAX_WEP_KEYS][WLAN_KEY_LEN_WEP104];
         int def;
 };
 
diff --git a/net/wireless/ibss.c b/net/wireless/ibss.c
index eafdfa5798ae..364f900a3dc4 100644
--- a/net/wireless/ibss.c
+++ b/net/wireless/ibss.c
@@ -43,7 +43,8 @@ void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid,
         cfg80211_hold_bss(bss_from_pub(bss));
         wdev->current_bss = bss_from_pub(bss);
 
-        cfg80211_upload_connect_keys(wdev);
+        if (!(wdev->wiphy->flags & WIPHY_FLAG_HAS_STATIC_WEP))
+                cfg80211_upload_connect_keys(wdev);
 
         nl80211_send_ibss_bssid(wiphy_to_rdev(wdev->wiphy), dev, bssid,
                                 GFP_KERNEL);
@@ -296,7 +297,7 @@ int cfg80211_ibss_wext_join(struct cfg80211_registered_device *rdev,
                 ck = kmemdup(wdev->wext.keys, sizeof(*ck), GFP_KERNEL);
                 if (!ck)
                         return -ENOMEM;
-                for (i = 0; i < 4; i++)
+                for (i = 0; i < CFG80211_MAX_WEP_KEYS; i++)
                         ck->params[i].key = ck->data[i];
         }
         err = __cfg80211_join_ibss(rdev, wdev->netdev,
diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index c08a3b57dca1..a77db333927e 100644
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -726,7 +726,8 @@ void __cfg80211_connect_result(struct net_device *dev, const u8 *bssid,
 
         wdev->current_bss = bss_from_pub(bss);
 
-        cfg80211_upload_connect_keys(wdev);
+        if (!(wdev->wiphy->flags & WIPHY_FLAG_HAS_STATIC_WEP))
+                cfg80211_upload_connect_keys(wdev);
 
         rcu_read_lock();
         country_ie = ieee80211_bss_get_ie(bss, WLAN_EID_COUNTRY);
@@ -1043,6 +1044,9 @@ int cfg80211_connect(struct cfg80211_registered_device *rdev,
                                 connect->crypto.ciphers_pairwise[0] = cipher;
                         }
                 }
+
+                connect->crypto.wep_keys = connkeys->params;
+                connect->crypto.wep_tx_key = connkeys->def;
         } else {
                 if (WARN_ON(connkeys))
                         return -EINVAL;
diff --git a/net/wireless/util.c b/net/wireless/util.c
index 9e6e2aaa7766..e02141d66b69 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -912,7 +912,7 @@ void cfg80211_upload_connect_keys(struct wireless_dev *wdev)
         if (!wdev->connect_keys)
                 return;
 
-        for (i = 0; i < 4; i++) {
+        for (i = 0; i < CFG80211_MAX_WEP_KEYS; i++) {
                 if (!wdev->connect_keys->params[i].cipher)
                         continue;
                 if (rdev_add_key(rdev, dev, i, false, NULL,
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index 2b096c02eb85..a220156cf217 100644
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -415,7 +415,7 @@ static int __cfg80211_set_encryption(struct cfg80211_registered_device *rdev,
                                           GFP_KERNEL);
                 if (!wdev->wext.keys)
                         return -ENOMEM;
-                for (i = 0; i < 4; i++)
+                for (i = 0; i < CFG80211_MAX_WEP_KEYS; i++)
                         wdev->wext.keys->params[i].key =
                                 wdev->wext.keys->data[i];
         }
diff --git a/net/wireless/wext-sme.c b/net/wireless/wext-sme.c
index 88f1f6931ab8..995163830a61 100644
--- a/net/wireless/wext-sme.c
+++ b/net/wireless/wext-sme.c
@@ -46,7 +46,7 @@ int cfg80211_mgd_wext_connect(struct cfg80211_registered_device *rdev,
                 ck = kmemdup(wdev->wext.keys, sizeof(*ck), GFP_KERNEL);
                 if (!ck)
                         return -ENOMEM;
-                for (i = 0; i < 4; i++)
+                for (i = 0; i < CFG80211_MAX_WEP_KEYS; i++)
                         ck->params[i].key = ck->data[i];
         }