summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom/mac80211.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-07-09 17:38:47 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2013-07-12 00:03:17 +0200
commitc28ac2e1706335d815722be6c69b8e7f95d808dd (patch)
tree2d2b050f0e570087166945f7f48e5a7f236ef873 /patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom/mac80211.patch
parent39f06d086f496840016ab8e204903eefee70afe1 (diff)
backports: refresh patches on v3.10
== ckmake-report.log == 1 2.6.24 [ OK ] 2 2.6.25 [ OK ] 3 2.6.26 [ OK ] 4 2.6.27 [ OK ] 5 2.6.28 [ OK ] 6 2.6.29 [ OK ] 7 2.6.30 [ OK ] 8 2.6.31 [ OK ] 9 2.6.32 [ OK ] 10 2.6.33 [ OK ] 11 2.6.34 [ OK ] 12 2.6.35 [ OK ] 13 2.6.36 [ OK ] 14 2.6.37 [ OK ] 15 2.6.38 [ OK ] 16 2.6.39 [ OK ] 17 3.0.85 [ OK ] 18 3.1.10 [ OK ] 19 3.10.0 [ OK ] 20 3.2.48 [ OK ] 21 3.3.8 [ OK ] 22 3.4.52 [ OK ] 23 3.5.7 [ OK ] 24 3.6.11 [ OK ] 25 3.7.10 [ OK ] 26 3.8.13 [ OK ] 27 3.9.9 [ OK ] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom/mac80211.patch')
-rw-r--r--patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom/mac80211.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom/mac80211.patch b/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom/mac80211.patch
index 83749a52..610175c1 100644
--- a/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom/mac80211.patch
+++ b/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom/mac80211.patch
@@ -1,6 +1,6 @@
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
-@@ -1565,6 +1565,7 @@ int ieee80211_if_add(struct ieee80211_lo
+@@ -1586,6 +1586,7 @@ int ieee80211_if_add(struct ieee80211_lo
return -ENOMEM;
dev_net_set(ndev, wiphy_net(local->hw.wiphy));
@@ -8,7 +8,7 @@
ndev->needed_headroom = local->tx_headroom +
4*6 /* four MAC addresses */
+ 2 + 2 + 2 + 2 /* ctl, dur, seq, qos */
-@@ -1573,6 +1574,7 @@ int ieee80211_if_add(struct ieee80211_lo
+@@ -1594,6 +1595,7 @@ int ieee80211_if_add(struct ieee80211_lo
- ETH_HLEN /* ethernet hard_header_len */
+ IEEE80211_ENCRYPT_HEADROOM;
ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM;