Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'upstream-fixes' of... 

Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
parents 80b02e59 fe5f8e2a

drivers/net/wireless/ipw2100.c

+1 −1
Original line number Diff line number Diff line
@@ -2664,7 +2664,7 @@ static void __ipw2100_rx_process(struct ipw2100_priv *priv) 
				break;

			}

#endif

			if (stats.len < sizeof(u->rx_data.header))

			if (stats.len < sizeof(struct ieee80211_hdr_3addr))

				break;

			switch (WLAN_FC_GET_TYPE(u->rx_data.header.frame_ctl)) {

			case IEEE80211_FTYPE_MGMT:

include/net/ieee80211.h

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ struct ieee80211_snap_hdr { 
#define WLAN_FC_GET_STYPE(fc) ((fc) & IEEE80211_FCTL_STYPE)



#define WLAN_GET_SEQ_FRAG(seq) ((seq) & IEEE80211_SCTL_FRAG)

#define WLAN_GET_SEQ_SEQ(seq)  ((seq) & IEEE80211_SCTL_SEQ)

#define WLAN_GET_SEQ_SEQ(seq)  (((seq) & IEEE80211_SCTL_SEQ) >> 4)



/* Authentication algorithms */

#define WLAN_AUTH_OPEN 0