diff options
| author |   Yogesh Ashok Powar <yogeshp@marvell.com> | 2011-05-13 11:22:32 -0700 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2011-05-16 14:10:50 -0400 |
| commit | 3b8ab88acaceb505aa06ef3bbf3a73b92470ae78 (patch) | |
| tree | d4f413db4e76621089bc68c917c765c5807013cd /drivers/net/wireless/mwifiex/sta_rx.c | |
| parent | cfg80211: make stripping of 802.11 header optional from AMSDU (diff) | |
| download | linux-dev-3b8ab88acaceb505aa06ef3bbf3a73b92470ae78.tar.xz linux-dev-3b8ab88acaceb505aa06ef3bbf3a73b92470ae78.zip | |
mwifiex: use ieee80211_amsdu_to_8023s routine
mwifiex was using its own implementation of converting 802.11n
AMSDU to 802.3s. This patch removes mwifiex specific
implementation and uses existing ieee80211_amsdu_to_8023s
routine.
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 '')
| -rw-r--r-- | drivers/net/wireless/mwifiex/sta_rx.c | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/drivers/net/wireless/mwifiex/sta_rx.c b/drivers/net/wireless/mwifiex/sta_rx.c index e047f0d8a983..1fdddece7479 100644 --- a/drivers/net/wireless/mwifiex/sta_rx.c +++ b/drivers/net/wireless/mwifiex/sta_rx.c @@ -141,10 +141,28 @@ int mwifiex_process_sta_rx_packet(struct mwifiex_adapter *adapter, dev_kfree_skb_any(skb); return ret; } + if (local_rx_pd->rx_pkt_type == PKT_TYPE_AMSDU) { - mwifiex_11n_deaggregate_pkt(priv, skb); - return ret; + struct sk_buff_head list; + struct sk_buff *rx_skb; + + __skb_queue_head_init(&list); + + skb_pull(skb, local_rx_pd->rx_pkt_offset); + skb_trim(skb, local_rx_pd->rx_pkt_length); + + ieee80211_amsdu_to_8023s(skb, &list, priv->curr_addr, + priv->wdev->iftype, 0, false); + + while (!skb_queue_empty(&list)) { + rx_skb = __skb_dequeue(&list); + ret = mwifiex_recv_packet(adapter, rx_skb); + if (ret == -1) + dev_err(adapter->dev, "Rx of A-MSDU failed"); + } + return 0; } + /* * If the packet is not an unicast packet then send the packet * directly to os. Don't pass thru rx reordering |