diff options
| author | Helmut Schaa <helmut.schaa@googlemail.com> | 2009-03-06 09:32:20 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-03-16 18:09:33 -0400 |
| commit | 30e1863ccb2eb8052eb134abe51d6884cac50e29 (patch) | |
| tree | 6994d0c7fd55d8457fe52a8b7d8634d7352daf6c /drivers/net/wireless/ipw2x00 | |
| parent | 3756162b06001d122ce31c716f9784636c592c9c (diff) | |
ipw2x00: remove duplicated defines
Remove several duplicated defines from ipw2x00/ieee80211.h which are
also available in linux/ieee80211.h.
Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ipw2x00')
| -rw-r--r-- | drivers/net/wireless/ipw2x00/ieee80211.h | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/drivers/net/wireless/ipw2x00/ieee80211.h b/drivers/net/wireless/ipw2x00/ieee80211.h index 97c7cfce5434..e292114629d7 100644 --- a/drivers/net/wireless/ipw2x00/ieee80211.h +++ b/drivers/net/wireless/ipw2x00/ieee80211.h | |||
| @@ -54,59 +54,6 @@ | |||
| 54 | #define MIN_FRAG_THRESHOLD 256U | 54 | #define MIN_FRAG_THRESHOLD 256U |
| 55 | #define MAX_FRAG_THRESHOLD 2346U | 55 | #define MAX_FRAG_THRESHOLD 2346U |
| 56 | 56 | ||
| 57 | /* Frame control field constants */ | ||
| 58 | #define IEEE80211_FCTL_VERS 0x0003 | ||
| 59 | #define IEEE80211_FCTL_FTYPE 0x000c | ||
| 60 | #define IEEE80211_FCTL_STYPE 0x00f0 | ||
| 61 | #define IEEE80211_FCTL_TODS 0x0100 | ||
| 62 | #define IEEE80211_FCTL_FROMDS 0x0200 | ||
| 63 | #define IEEE80211_FCTL_MOREFRAGS 0x0400 | ||
| 64 | #define IEEE80211_FCTL_RETRY 0x0800 | ||
| 65 | #define IEEE80211_FCTL_PM 0x1000 | ||
| 66 | #define IEEE80211_FCTL_MOREDATA 0x2000 | ||
| 67 | #define IEEE80211_FCTL_PROTECTED 0x4000 | ||
| 68 | #define IEEE80211_FCTL_ORDER 0x8000 | ||
| 69 | |||
| 70 | #define IEEE80211_FTYPE_MGMT 0x0000 | ||
| 71 | #define IEEE80211_FTYPE_CTL 0x0004 | ||
| 72 | #define IEEE80211_FTYPE_DATA 0x0008 | ||
| 73 | |||
| 74 | /* management */ | ||
| 75 | #define IEEE80211_STYPE_ASSOC_REQ 0x0000 | ||
| 76 | #define IEEE80211_STYPE_ASSOC_RESP 0x0010 | ||
| 77 | #define IEEE80211_STYPE_REASSOC_REQ 0x0020 | ||
| 78 | #define IEEE80211_STYPE_REASSOC_RESP 0x0030 | ||
| 79 | #define IEEE80211_STYPE_PROBE_REQ 0x0040 | ||
| 80 | #define IEEE80211_STYPE_PROBE_RESP 0x0050 | ||
| 81 | #define IEEE80211_STYPE_BEACON 0x0080 | ||
| 82 | #define IEEE80211_STYPE_ATIM 0x0090 | ||
| 83 | #define IEEE80211_STYPE_DISASSOC 0x00A0 | ||
| 84 | #define IEEE80211_STYPE_AUTH 0x00B0 | ||
| 85 | #define IEEE80211_STYPE_DEAUTH 0x00C0 | ||
| 86 | #define IEEE80211_STYPE_ACTION 0x00D0 | ||
| 87 | |||
| 88 | /* control */ | ||
| 89 | #define IEEE80211_STYPE_PSPOLL 0x00A0 | ||
| 90 | #define IEEE80211_STYPE_RTS 0x00B0 | ||
| 91 | #define IEEE80211_STYPE_CTS 0x00C0 | ||
| 92 | #define IEEE80211_STYPE_ACK 0x00D0 | ||
| 93 | #define IEEE80211_STYPE_CFEND 0x00E0 | ||
| 94 | #define IEEE80211_STYPE_CFENDACK 0x00F0 | ||
| 95 | |||
| 96 | /* data */ | ||
| 97 | #define IEEE80211_STYPE_DATA 0x0000 | ||
| 98 | #define IEEE80211_STYPE_DATA_CFACK 0x0010 | ||
| 99 | #define IEEE80211_STYPE_DATA_CFPOLL 0x0020 | ||
| 100 | #define IEEE80211_STYPE_DATA_CFACKPOLL 0x0030 | ||
| 101 | #define IEEE80211_STYPE_NULLFUNC 0x0040 | ||
| 102 | #define IEEE80211_STYPE_CFACK 0x0050 | ||
| 103 | #define IEEE80211_STYPE_CFPOLL 0x0060 | ||
| 104 | #define IEEE80211_STYPE_CFACKPOLL 0x0070 | ||
| 105 | #define IEEE80211_STYPE_QOS_DATA 0x0080 | ||
| 106 | |||
| 107 | #define IEEE80211_SCTL_FRAG 0x000F | ||
| 108 | #define IEEE80211_SCTL_SEQ 0xFFF0 | ||
| 109 | |||
| 110 | /* QOS control */ | 57 | /* QOS control */ |
| 111 | #define IEEE80211_QCTL_TID 0x000F | 58 | #define IEEE80211_QCTL_TID 0x000F |
| 112 | 59 | ||