Commit b27a1ed5 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream-fixes' of... 

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

net/ieee80211/ieee80211_crypt_ccmp.c

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static void ccmp_init_blocks(struct crypto_tfm *tfm, 
	a4_included = ((fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) ==

		       (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS));

	qc_included = ((WLAN_FC_GET_TYPE(fc) == IEEE80211_FTYPE_DATA) &&

		       (WLAN_FC_GET_STYPE(fc) & 0x08));

		       (WLAN_FC_GET_STYPE(fc) & IEEE80211_STYPE_QOS_DATA));

	aad_len = 22;

	if (a4_included)

		aad_len += 6;

net/ieee80211/ieee80211_rx.c

+2 −2
Original line number Diff line number Diff line
@@ -1417,10 +1417,10 @@ static void ieee80211_process_probe_response(struct ieee80211_device 


	if (is_beacon(beacon->header.frame_ctl)) {

		if (ieee->handle_beacon != NULL)

			ieee->handle_beacon(dev, beacon, &network);

			ieee->handle_beacon(dev, beacon, target);

	} else {

		if (ieee->handle_probe_response != NULL)

			ieee->handle_probe_response(dev, beacon, &network);

			ieee->handle_probe_response(dev, beacon, target);

	}

}