mac80211: support A-MSDU in fast-rx
Subsystems (2)
PATCH v2 1/1 mac80211: support A-MSDU in fast-rx
Only works if the IV was stripped from packets. Create a smaller variant of ieee80211_rx_h_amsdu, which bypasses checks already done within the fast-rx context.
Signed-off-by Felix Fietkau <[email protected]>
--- include/net/cfg80211.h | 6 ++- net/mac80211/rx.c | 124 +++++++++++++++++++++++++++++-------------------- net/wireless/util.c | 5 +- 3 files changed, 80 insertions(+), 55 deletions(-)
include/net/cfg80211.h +4 -2
@@ -4410,10 +4410,12 @@ unsigned int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr);* of it being pushed into the SKB * @addr: the device MAC address * @iftype: the virtual interface type +* @data_offset: offset of payload after the 802.11 header * Return: 0 on success. Non-zero on error. */ int ieee80211_data_to_8023_exthdr (struct sk_buff *skb,struct ethhdr *ehdr, -const u8 *addr,enum nl80211_iftype iftype); +const u8 *addr,enum nl80211_iftype iftype, +u8 data_offset);/** * ieee80211_data_to_8023 - convert an 802.11 data frame to 802.3
@@ -4425,7 +4427,7 @@ int ieee80211_data_to_8023_exthdr(struct sk_buff *skb, struct ethhdr *ehdr,static inline int ieee80211_data_to_8023 (struct sk_buff *skb,const u8 *addr,enum nl80211_iftype iftype) { -return ieee80211_data_to_8023_exthdr (skb,NULL , addr, iftype); +return ieee80211_data_to_8023_exthdr (skb,NULL , addr, iftype,0 ); }/**
net/mac80211/rx.c +73 -51
189 lines not on this page · raw message
net/wireless/util.c +3 -2
@@ -420,7 +420,8 @@ unsigned int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr)EXPORT_SYMBOL (ieee80211_get_mesh_hdrlen);int ieee80211_data_to_8023_exthdr (struct sk_buff *skb,struct ethhdr *ehdr, -const u8 *addr,enum nl80211_iftype iftype) +const u8 *addr,enum nl80211_iftype iftype, +u8 data_offset) {struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;struct {
@@ -434,7 +435,7 @@ int ieee80211_data_to_8023_exthdr(struct sk_buff *skb, struct ethhdr *ehdr,if (unlikely (!ieee80211_is_data_present (hdr->frame_control)))return -1 ; - hdrlen =ieee80211_hdrlen (hdr->frame_control); + hdrlen =ieee80211_hdrlen (hdr->frame_control) + data_offset;if (skb->len < hdrlen +8 )return -1 ;
Signature · 1 line
2.14.2