1 files changed, 3 insertions, 2 deletions

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,