hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Yogesh Ashok Powar 2011-05-13 11:22:31 -07:00 committed by John W. Linville
parent 57cf8043a6
commit 8b3becadc8
4 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/wireless/iwmc3200wifi/rx.c
View File

@ -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); IWM_HEXDUMP(iwm, DBG, RX, "A-MSDU: ", skb->data, skb->len);
__skb_queue_head_init(&list); __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))) { while ((frame = __skb_dequeue(&list))) {
ndev->stats.rx_packets++; ndev->stats.rx_packets++;

4
include/net/cfg80211.h
View File

@ -2237,10 +2237,12 @@ int ieee80211_data_from_8023(struct sk_buff *skb, const u8 *addr,
* @addr: The device MAC address. * @addr: The device MAC address.
* @iftype: The device interface type. * @iftype: The device interface type.
* @extra_headroom: The hardware extra headroom for SKBs in the @list. * @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, void ieee80211_amsdu_to_8023s(struct sk_buff *skb, struct sk_buff_head *list,
const u8 *addr, enum nl80211_iftype iftype, 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 * cfg80211_classify8021d - determine the 802.1p/1d tag for a data frame

2
net/mac80211/rx.c
View File

@ -1783,7 +1783,7 @@ ieee80211_rx_h_amsdu(struct ieee80211_rx_data *rx)
ieee80211_amsdu_to_8023s(skb, &frame_list, dev->dev_addr, ieee80211_amsdu_to_8023s(skb, &frame_list, dev->dev_addr,
rx->sdata->vif.type, rx->sdata->vif.type,
rx->local->hw.extra_tx_headroom); rx->local->hw.extra_tx_headroom, true);
while (!skb_queue_empty(&frame_list)) { while (!skb_queue_empty(&frame_list)) {
rx->skb = __skb_dequeue(&frame_list); rx->skb = __skb_dequeue(&frame_list);

21
net/wireless/util.c
View File

@ -544,7 +544,8 @@ EXPORT_SYMBOL(ieee80211_data_from_8023);
void ieee80211_amsdu_to_8023s(struct sk_buff *skb, struct sk_buff_head *list, void ieee80211_amsdu_to_8023s(struct sk_buff *skb, struct sk_buff_head *list,
const u8 *addr, enum nl80211_iftype iftype, 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; struct sk_buff *frame = NULL;
u16 ethertype; u16 ethertype;
@ -553,14 +554,18 @@ void ieee80211_amsdu_to_8023s(struct sk_buff *skb, struct sk_buff_head *list,
int remaining, err; int remaining, err;
u8 dst[ETH_ALEN], src[ETH_ALEN]; u8 dst[ETH_ALEN], src[ETH_ALEN];
err = ieee80211_data_to_8023(skb, addr, iftype); if (has_80211_header) {
if (err) err = ieee80211_data_to_8023(skb, addr, iftype);
goto out; if (err)
goto out;
/* skip the wrapping header */ /* skip the wrapping header */
eth = (struct ethhdr *) skb_pull(skb, sizeof(struct ethhdr)); eth = (struct ethhdr *) skb_pull(skb, sizeof(struct ethhdr));
if (!eth) if (!eth)
goto out; goto out;
} else {
eth = (struct ethhdr *) skb->data;
}
while (skb != frame) { while (skb != frame) {
u8 padding; u8 padding;