diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-09-08 11:44:28 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-09-11 15:53:37 -0400 |
commit | 44d414dbff9d5bf46fc09f2e68567b5848cbbfd3 (patch) | |
tree | 9e55cb581602867a3d8365666b33dd9469ccc084 /include | |
parent | 5484e23749e78d5a4f56928efaf3c4b0d862b7a6 (diff) |
mac80211: move some HT code out of mlme.c
Some of the HT code in mlme.c is misplaced:
* constants/definitions belong to the ieee80211.h header
* code being used in other modes as well shouldn't be there
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/ieee80211.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index 333d3ae76883..abc1abc63bf0 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h | |||
@@ -643,6 +643,9 @@ struct ieee80211_mgmt { | |||
643 | } u; | 643 | } u; |
644 | } __attribute__ ((packed)); | 644 | } __attribute__ ((packed)); |
645 | 645 | ||
646 | /* mgmt header + 1 byte category code */ | ||
647 | #define IEEE80211_MIN_ACTION_SIZE offsetof(struct ieee80211_mgmt, u.action.u) | ||
648 | |||
646 | 649 | ||
647 | /* Control frames */ | 650 | /* Control frames */ |
648 | struct ieee80211_rts { | 651 | struct ieee80211_rts { |
@@ -737,6 +740,21 @@ struct ieee80211_ht_addt_info { | |||
737 | #define IEEE80211_HT_IE_NON_GF_STA_PRSNT 0x0004 | 740 | #define IEEE80211_HT_IE_NON_GF_STA_PRSNT 0x0004 |
738 | #define IEEE80211_HT_IE_NON_HT_STA_PRSNT 0x0010 | 741 | #define IEEE80211_HT_IE_NON_HT_STA_PRSNT 0x0010 |
739 | 742 | ||
743 | /* block-ack parameters */ | ||
744 | #define IEEE80211_ADDBA_PARAM_POLICY_MASK 0x0002 | ||
745 | #define IEEE80211_ADDBA_PARAM_TID_MASK 0x003C | ||
746 | #define IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK 0xFFA0 | ||
747 | #define IEEE80211_DELBA_PARAM_TID_MASK 0xF000 | ||
748 | #define IEEE80211_DELBA_PARAM_INITIATOR_MASK 0x0800 | ||
749 | |||
750 | /* | ||
751 | * A-PMDU buffer sizes | ||
752 | * According to IEEE802.11n spec size varies from 8K to 64K (in powers of 2) | ||
753 | */ | ||
754 | #define IEEE80211_MIN_AMPDU_BUF 0x8 | ||
755 | #define IEEE80211_MAX_AMPDU_BUF 0x40 | ||
756 | |||
757 | |||
740 | /* Spatial Multiplexing Power Save Modes */ | 758 | /* Spatial Multiplexing Power Save Modes */ |
741 | #define WLAN_HT_CAP_SM_PS_STATIC 0 | 759 | #define WLAN_HT_CAP_SM_PS_STATIC 0 |
742 | #define WLAN_HT_CAP_SM_PS_DYNAMIC 1 | 760 | #define WLAN_HT_CAP_SM_PS_DYNAMIC 1 |