diff options
| author | David S. Miller <davem@davemloft.net> | 2018-03-02 17:50:21 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-03-02 17:50:21 +0300 |
| commit | 731cb7e05f376c2e61baff730eaff52f99d3e4b5 (patch) | |
| tree | 74c3bf251531d51e5b14f31b4f69d5d219dfe035 /include | |
| parent | ad0bff0570727620840c4005992946cce1dff693 (diff) | |
| parent | 2e75bb2f8b8928aa01d91219a90df1e6fbc7cdd4 (diff) | |
| download | linux-731cb7e05f376c2e61baff730eaff52f99d3e4b5.tar.xz | |
Merge tag 'mac80211-next-for-davem-2018-03-02' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
Only a few new things:
* hwsim net namespace stuff from Kirill Tkhai
* A-MSDU support in fast-RX
* 4-addr mode support in fast-RX
* support for a spec quirk in Add-BA negotiation
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/cfg80211.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 56e905cd4b07..fc40843baed3 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -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); } /** |