diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-04 11:58:14 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-04 11:58:14 -0500 |
| commit | 10be7eb36b93364b98688831ee7d26f58402bb96 (patch) | |
| tree | eb13ae80fcaa8baacd804a721c5a4962a501a2a4 /include/linux | |
| parent | 90c30335a70e96b8b8493b7deb15e6b30e6d9fce (diff) | |
| parent | 5ffaf8a361b4c9025963959a744f21d8173c7669 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ieee80211.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index 842701906ae9..19984958ab7b 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h | |||
| @@ -138,6 +138,8 @@ | |||
| 138 | #define IEEE80211_WMM_IE_STA_QOSINFO_SP_MASK 0x03 | 138 | #define IEEE80211_WMM_IE_STA_QOSINFO_SP_MASK 0x03 |
| 139 | #define IEEE80211_WMM_IE_STA_QOSINFO_SP_SHIFT 5 | 139 | #define IEEE80211_WMM_IE_STA_QOSINFO_SP_SHIFT 5 |
| 140 | 140 | ||
| 141 | #define IEEE80211_HT_CTL_LEN 4 | ||
| 142 | |||
| 141 | struct ieee80211_hdr { | 143 | struct ieee80211_hdr { |
| 142 | __le16 frame_control; | 144 | __le16 frame_control; |
| 143 | __le16 duration_id; | 145 | __le16 duration_id; |