diff options
author | Yogesh Ashok Powar <yogeshp@marvell.com> | 2011-05-13 14:22:31 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-05-16 14:10:50 -0400 |
commit | 8b3becadc82de3b87a5c196239db3fef6caa9c82 (patch) | |
tree | d71a3c7e29d30c92c4b677257c289ca63b4e65f3 /include/net/cfg80211.h | |
parent | 57cf8043a64b56a10b9f194572548a3dfb62e596 (diff) |
cfg80211: make stripping of 802.11 header optional from AMSDU
Currently the devices that have already stripped IEEE 802.11
header from the AMSDU SKB can not use ieee80211_amsdu_to_8023s
routine. This patch enhances ieee80211_amsdu_to_8023s() API by
changing mandatory removing of IEEE 802.11 header from AMSDU
to optional.
Signed-off-by: Yogesh Ashok Powar <yogeshp@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/net/cfg80211.h')
-rw-r--r-- | include/net/cfg80211.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 0a2d795d35d..bfd6557946b 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h | |||
@@ -2237,10 +2237,12 @@ int ieee80211_data_from_8023(struct sk_buff *skb, const u8 *addr, | |||
2237 | * @addr: The device MAC address. | 2237 | * @addr: The device MAC address. |
2238 | * @iftype: The device interface type. | 2238 | * @iftype: The device interface type. |
2239 | * @extra_headroom: The hardware extra headroom for SKBs in the @list. | 2239 | * @extra_headroom: The hardware extra headroom for SKBs in the @list. |
2240 | * @has_80211_header: Set it true if SKB is with IEEE 802.11 header. | ||
2240 | */ | 2241 | */ |
2241 | void ieee80211_amsdu_to_8023s(struct sk_buff *skb, struct sk_buff_head *list, | 2242 | void ieee80211_amsdu_to_8023s(struct sk_buff *skb, struct sk_buff_head *list, |
2242 | const u8 *addr, enum nl80211_iftype iftype, | 2243 | const u8 *addr, enum nl80211_iftype iftype, |
2243 | const unsigned int extra_headroom); | 2244 | const unsigned int extra_headroom, |
2245 | bool has_80211_header); | ||
2244 | 2246 | ||
2245 | /** | 2247 | /** |
2246 | * cfg80211_classify8021d - determine the 802.1p/1d tag for a data frame | 2248 | * cfg80211_classify8021d - determine the 802.1p/1d tag for a data frame |