diff options
| author | Yogesh Ashok Powar <yogeshp@marvell.com> | 2011-05-13 11:22:31 -0700 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-05-16 14:10:50 -0400 |
| commit | 8b3becadc82de3b87a5c196239db3fef6caa9c82 (patch) | |
| tree | d71a3c7e29d30c92c4b677257c289ca63b4e65f3 /net/mac80211 | |
| parent | 57cf8043a64b56a10b9f194572548a3dfb62e596 (diff) | |
| download | linux-3.10-8b3becadc82de3b87a5c196239db3fef6caa9c82.tar.gz linux-3.10-8b3becadc82de3b87a5c196239db3fef6caa9c82.tar.bz2 linux-3.10-8b3becadc82de3b87a5c196239db3fef6caa9c82.zip | |
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 'net/mac80211')
| -rw-r--r-- | net/mac80211/rx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 3a9515cb7ce..78c72a41d86 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1783,7 +1783,7 @@ ieee80211_rx_h_amsdu(struct ieee80211_rx_data *rx) ieee80211_amsdu_to_8023s(skb, &frame_list, dev->dev_addr, rx->sdata->vif.type, - rx->local->hw.extra_tx_headroom); + rx->local->hw.extra_tx_headroom, true); while (!skb_queue_empty(&frame_list)) { rx->skb = __skb_dequeue(&frame_list); |