aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-03-16 19:16:59 -0500
committerJeff Garzik <jeff@garzik.org>2006-03-16 19:16:59 -0500
commitb27a1ed571e12e7ec75b8907bf02fd69fd2bfe10 (patch)
treee5b305e07c559f92275cbd902bda70aeaeca7346
parentca68bb1e41c4937fc125d3917dd1feadc493d850 (diff)
parent72df16f109b73be37977a26d342e9103e8851cb6 (diff)
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
-rw-r--r--net/ieee80211/ieee80211_crypt_ccmp.c2
-rw-r--r--net/ieee80211/ieee80211_rx.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/net/ieee80211/ieee80211_crypt_ccmp.c b/net/ieee80211/ieee80211_crypt_ccmp.c
index 470221728503..3840d1911f2b 100644
--- a/net/ieee80211/ieee80211_crypt_ccmp.c
+++ b/net/ieee80211/ieee80211_crypt_ccmp.c
@@ -131,7 +131,7 @@ static void ccmp_init_blocks(struct crypto_tfm *tfm,
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;
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
index b410ab8bcf7a..7ac6a7165d9c 100644
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -1417,10 +1417,10 @@ static void ieee80211_process_probe_response(struct ieee80211_device
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