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 /include | |
| parent | 80b02e595c308a5deb2ad49bd6aa3ab1da9cdbdb (diff) | |
| parent | fe5f8e2a1c5c040209c598a28e19c55f30e1040d (diff) | |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/ieee80211.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h index e6af381e206d..e02d85f56e60 100644 --- a/include/net/ieee80211.h +++ b/include/net/ieee80211.h | |||
| @@ -218,7 +218,7 @@ struct ieee80211_snap_hdr { | |||
| 218 | #define WLAN_FC_GET_STYPE(fc) ((fc) & IEEE80211_FCTL_STYPE) | 218 | #define WLAN_FC_GET_STYPE(fc) ((fc) & IEEE80211_FCTL_STYPE) |
| 219 | 219 | ||
| 220 | #define WLAN_GET_SEQ_FRAG(seq) ((seq) & IEEE80211_SCTL_FRAG) | 220 | #define WLAN_GET_SEQ_FRAG(seq) ((seq) & IEEE80211_SCTL_FRAG) |
| 221 | #define WLAN_GET_SEQ_SEQ(seq) ((seq) & IEEE80211_SCTL_SEQ) | 221 | #define WLAN_GET_SEQ_SEQ(seq) (((seq) & IEEE80211_SCTL_SEQ) >> 4) |
| 222 | 222 | ||
| 223 | /* Authentication algorithms */ | 223 | /* Authentication algorithms */ |
| 224 | #define WLAN_AUTH_OPEN 0 | 224 | #define WLAN_AUTH_OPEN 0 |