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

Jeff Garzik committed 20 years ago

Commit b27a1ed2 parents ca68bb1 72df16f2 files · +3 −3Browse files

Unified · Split

2 files

net/ieee80211/ieee80211_crypt_ccmp.c +1 −1
net/ieee80211/ieee80211_rx.c +2 −2

net/ieee80211/ieee80211_crypt_ccmp.c+1−1

@@ -131,7 +131,7 @@ static void ccmp_init_blocks(struct crypto_tfm *tfm, · 130 unmodified lines
131	a4_included = ((fc & (IEEE80211_FCTL_TODS \| IEEE80211_FCTL_FROMDS)) ==	131	a4_included = ((fc & (IEEE80211_FCTL_TODS \| IEEE80211_FCTL_FROMDS)) ==
132	(IEEE80211_FCTL_TODS \| IEEE80211_FCTL_FROMDS));	132	(IEEE80211_FCTL_TODS \| IEEE80211_FCTL_FROMDS));
133	qc_included = ((WLAN_FC_GET_TYPE(fc) == IEEE80211_FTYPE_DATA) &&	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	aad_len = 22;	135	aad_len = 22;
136	if (a4_included)	136	if (a4_included)
137	aad_len += 6;	137	aad_len += 6;

net/ieee80211/ieee80211_rx.c+2−2

@@ -1417,10 +1417,10 @@ static void ieee80211_process_probe_response(struct ieee80211_device · 1416 unmodified lines
1417		1417
1418	if (is_beacon(beacon->header.frame_ctl)) {	1418	if (is_beacon(beacon->header.frame_ctl)) {
1419	if (ieee->handle_beacon != NULL)	1419	if (ieee->handle_beacon != NULL)
1420	ieee->handle_beacon(dev, beacon, &network);	1420	ieee->handle_beacon(dev, beacon, target);
1421	} else {	1421	} else {
1422	if (ieee->handle_probe_response != NULL)	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