Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
+3
-3
+1
-1
net/ieee80211/ieee80211_crypt_ccmp.c
+1
-1
net/ieee80211/ieee80211_crypt_ccmp.c
···
131
131
a4_included = ((fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) ==
132
132
(IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS));
133
133
qc_included = ((WLAN_FC_GET_TYPE(fc) == IEEE80211_FTYPE_DATA) &&
134
-
(WLAN_FC_GET_STYPE(fc) & 0x08));
134
+
(WLAN_FC_GET_STYPE(fc) & IEEE80211_STYPE_QOS_DATA));
135
135
aad_len = 22;
136
136
if (a4_included)
137
137
aad_len += 6;
+2
-2
net/ieee80211/ieee80211_rx.c
+2
-2
net/ieee80211/ieee80211_rx.c
···
1417
1417
1418
1418
if (is_beacon(beacon->header.frame_ctl)) {
1419
1419
if (ieee->handle_beacon != NULL)
1420
-
ieee->handle_beacon(dev, beacon, &network);
1420
+
ieee->handle_beacon(dev, beacon, target);
1421
1421
} else {
1422
1422
if (ieee->handle_probe_response != NULL)
1423
-
ieee->handle_probe_response(dev, beacon, &network);
1423
+
ieee->handle_probe_response(dev, beacon, target);
1424
1424
}
1425
1425
}
1426
1426