Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4bc3e17cce5662092703b02ee7b030047b1c99b3

Authored by David S. Miller
2 parents fee9dee730 ddd68587d0
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

Merge branch 'fixes-davem' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6

Showing 2 changed files Side-by-side Diff

... ... @@ -2449,13 +2449,15 @@
2449 2449 S: Maintained
2450 2450  
2451 2451 MAC80211
2452   -P: Jiri Benc
2453   -M: jbenc@suse.cz
2454 2452 P: Michael Wu
2455 2453 M: flamingice@sourmilk.net
  2454 +P: Johannes Berg
  2455 +M: johannes@sipsolutions.net
  2456 +P: Jiri Benc
  2457 +M: jbenc@suse.cz
2456 2458 L: linux-wireless@vger.kernel.org
2457 2459 W: http://linuxwireless.org/
2458   -T: git kernel.org:/pub/scm/linux/kernel/git/jbenc/mac80211.git
  2460 +T: git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git
2459 2461 S: Maintained
2460 2462  
2461 2463 MACVLAN DRIVER
net/mac80211/ieee80211_sta.c
Diff comments   View file @ 4bc3e17
... ... @@ -1184,7 +1184,7 @@
1184 1184 printk(KERN_DEBUG "%s: RX %sssocResp from %s (capab=0x%x "
1185 1185 "status=%d aid=%d)\n",
1186 1186 dev->name, reassoc ? "Rea" : "A", print_mac(mac, mgmt->sa),
1187   - capab_info, status_code, aid & ~(BIT(15) | BIT(14)));
  1187 + capab_info, status_code, (u16)(aid & ~(BIT(15) | BIT(14))));
1188 1188  
1189 1189 if (status_code != WLAN_STATUS_SUCCESS) {
1190 1190 printk(KERN_DEBUG "%s: AP denied association (code=%d)\n",
... ... @@ -2096,7 +2096,8 @@
2096 2096 {
2097 2097 int tmp, hidden_ssid;
2098 2098  
2099   - if (!memcmp(ifsta->ssid, ssid, ssid_len))
  2099 + if (ssid_len == ifsta->ssid_len &&
  2100 + !memcmp(ifsta->ssid, ssid, ssid_len))
2100 2101 return 1;
2101 2102  
2102 2103 if (ifsta->flags & IEEE80211_STA_AUTO_BSSID_SEL)