aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/307-mac80211-add-hdrlen-to-ieee80211_tx_data.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2017-11-05 22:13:16 +0100
committerFelix Fietkau <nbd@nbd.name>2017-11-16 15:23:35 +0100
commitf9fa266faf9a2fdea48cc2fb72fa5a7e52a527c0 (patch)
tree677b801ef85f44c54cea9c9b580fd38d139511aa /package/kernel/mac80211/patches/307-mac80211-add-hdrlen-to-ieee80211_tx_data.patch
parenta8d751c243b9d840b97293b289adddb0df438358 (diff)
downloadupstream-f9fa266faf9a2fdea48cc2fb72fa5a7e52a527c0.tar.gz
upstream-f9fa266faf9a2fdea48cc2fb72fa5a7e52a527c0.tar.bz2
upstream-f9fa266faf9a2fdea48cc2fb72fa5a7e52a527c0.zip
mac80211: update to wireless-testing 2017-11-01
The wireless regdb is now loaded via firmware loading, CRDA support and built-in regdb support have been removed. Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/kernel/mac80211/patches/307-mac80211-add-hdrlen-to-ieee80211_tx_data.patch')
-rw-r--r--package/kernel/mac80211/patches/307-mac80211-add-hdrlen-to-ieee80211_tx_data.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/kernel/mac80211/patches/307-mac80211-add-hdrlen-to-ieee80211_tx_data.patch b/package/kernel/mac80211/patches/307-mac80211-add-hdrlen-to-ieee80211_tx_data.patch
index baaca173c7..934e2e122c 100644
--- a/package/kernel/mac80211/patches/307-mac80211-add-hdrlen-to-ieee80211_tx_data.patch
+++ b/package/kernel/mac80211/patches/307-mac80211-add-hdrlen-to-ieee80211_tx_data.patch
@@ -48,7 +48,7 @@ Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
if (likely(sta)) {
if (!IS_ERR(sta))
tx->sta = sta;
-@@ -3434,6 +3434,7 @@ begin:
+@@ -3468,6 +3468,7 @@ begin:
tx.local = local;
tx.skb = skb;
tx.sdata = vif_to_sdata(info->control.vif);
@@ -56,7 +56,7 @@ Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
if (txq->sta)
tx.sta = container_of(txq->sta, struct sta_info, sta);
-@@ -3756,6 +3757,7 @@ ieee80211_build_data_template(struct iee
+@@ -3790,6 +3791,7 @@ ieee80211_build_data_template(struct iee
hdr = (void *)skb->data;
tx.sta = sta_info_get(sdata, hdr->addr1);
tx.skb = skb;