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>

diff --git a/drivers/net/wireless/iwmc3200wifi/rx.c b/drivers/net/wireless/iwmc3200wifi/rx.c
index 9a57cf6a488fabba03d00c1f3d8d57970f1fd233..5665a1a9b99ef0ac511e5bafe68d3f7d19f1333f 100644 (file)
--- a/drivers/net/wireless/iwmc3200wifi/rx.c
+++ b/drivers/net/wireless/iwmc3200wifi/rx.c
@@ -1576,7 +1576,8 @@ static void iwm_rx_process_amsdu(struct iwm_priv *iwm, struct sk_buff *skb)
        IWM_HEXDUMP(iwm, DBG, RX, "A-MSDU: ", skb->data, skb->len);
 
        __skb_queue_head_init(&list);
-       ieee80211_amsdu_to_8023s(skb, &list, ndev->dev_addr, wdev->iftype, 0);
+       ieee80211_amsdu_to_8023s(skb, &list, ndev->dev_addr, wdev->iftype, 0,
+                                                                       true);
 
        while ((frame = __skb_dequeue(&list))) {
                ndev->stats.rx_packets++;

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 0a2d795d35dec63b16457fd081fcfa7e09869a60..bfd6557946beca9f5cf2525cf7931be4a2c51cbe 100644 (file)
--- 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,
  * @addr: The device MAC address.
  * @iftype: The device interface type.
  * @extra_headroom: The hardware extra headroom for SKBs in the @list.
+ * @has_80211_header: Set it true if SKB is with IEEE 802.11 header.
  */
 void ieee80211_amsdu_to_8023s(struct sk_buff *skb, struct sk_buff_head *list,
                              const u8 *addr, enum nl80211_iftype iftype,
-                             const unsigned int extra_headroom);
+                             const unsigned int extra_headroom,
+                             bool has_80211_header);
 
 /**
  * cfg80211_classify8021d - determine the 802.1p/1d tag for a data frame

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 3a9515cb7ce13c3f9dd2b22cf528b554922e08ed..78c72a41d8648e302212268f2767403a84261b8a 100644 (file)
--- 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);

diff --git a/net/wireless/util.c b/net/wireless/util.c
index 95e4e254da0a2bbeb0b7355af7374e68b2e7f965..f0536d44d43c18e11b54b8f060f8e1b5da42709d 100644 (file)
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -544,7 +544,8 @@ EXPORT_SYMBOL(ieee80211_data_from_8023);
 
 void ieee80211_amsdu_to_8023s(struct sk_buff *skb, struct sk_buff_head *list,
                              const u8 *addr, enum nl80211_iftype iftype,
-                             const unsigned int extra_headroom)
+                             const unsigned int extra_headroom,
+                             bool has_80211_header)
 {
        struct sk_buff *frame = NULL;
        u16 ethertype;
@@ -553,14 +554,18 @@ void ieee80211_amsdu_to_8023s(struct sk_buff *skb, struct sk_buff_head *list,
        int remaining, err;
        u8 dst[ETH_ALEN], src[ETH_ALEN];
 
-       err = ieee80211_data_to_8023(skb, addr, iftype);
-       if (err)
-               goto out;
+       if (has_80211_header) {
+               err = ieee80211_data_to_8023(skb, addr, iftype);
+               if (err)
+                       goto out;
 
-       /* skip the wrapping header */
-       eth = (struct ethhdr *) skb_pull(skb, sizeof(struct ethhdr));
-       if (!eth)
-               goto out;
+               /* skip the wrapping header */
+               eth = (struct ethhdr *) skb_pull(skb, sizeof(struct ethhdr));
+               if (!eth)
+                       goto out;
+       } else {
+               eth = (struct ethhdr *) skb->data;
+       }
 
        while (skb != frame) {
                u8 padding;