diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-01-07 22:44:56 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-01-07 22:44:56 -0500 |
| commit | 11897539a967059a817175ea57ad586a1faadd80 (patch) | |
| tree | 67dfb1a5608a9439d0d263dde37be27eee1ad83b | |
| parent | 80b02e595c308a5deb2ad49bd6aa3ab1da9cdbdb (diff) | |
| parent | fe5f8e2a1c5c040209c598a28e19c55f30e1040d (diff) | |
| download | kernel-crypto-11897539a967059a817175ea57ad586a1faadd80.tar.gz kernel-crypto-11897539a967059a817175ea57ad586a1faadd80.tar.xz kernel-crypto-11897539a967059a817175ea57ad586a1faadd80.zip | |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
| -rw-r--r-- | drivers/net/wireless/ipw2100.c | 2 | ||||
| -rw-r--r-- | include/net/ieee80211.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c index 0e94fbbf7a9..b85857a8487 100644 --- a/drivers/net/wireless/ipw2100.c +++ b/drivers/net/wireless/ipw2100.c @@ -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: diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h index e6af381e206..e02d85f56e6 100644 --- a/include/net/ieee80211.h +++ b/include/net/ieee80211.h @@ -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 |