diff --git a/[refs] b/[refs]
index 25498cbca810..4388bab564a7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93015f0f34e81a47c4126329746ce5f364bafd11
+refs/heads/master: 8ab65b03b7893da4a49009e7e356e36e27b0c407
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index 09a56e24b799..74777ade6b22 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -783,7 +783,7 @@ static void ieee80211_send_assoc(struct net_device *dev,
 		}
 	}
 
-	if (count == 8) {
+	if (rates_len > count) {
 		pos = skb_put(skb, rates_len - count + 2);
 		*pos++ = WLAN_EID_EXT_SUPP_RATES;
 		*pos++ = rates_len - count;