diff options
| author | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-05-07 17:01:08 -0700 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-05-08 09:02:09 +0200 |
| commit | b0225d5a4857282af7e81a80e1c35e14c87bfb0f (patch) | |
| tree | 5f1cd8c9925ef08fbb6259548837d867010791b3 /patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom | |
| parent | 68ee70bbfaf818704e79790912d2f062a83b0651 (diff) | |
backports: refresh patches for next-20130405
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom')
| -rw-r--r-- | patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom/mac80211.patch | 4 |
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 2b6a8a46..e5972740 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 -@@ -1518,6 +1518,7 @@ int ieee80211_if_add(struct ieee80211_lo +@@ -1513,6 +1513,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 */ -@@ -1526,6 +1527,7 @@ int ieee80211_if_add(struct ieee80211_lo +@@ -1521,6 +1522,7 @@ int ieee80211_if_add(struct ieee80211_lo - ETH_HLEN /* ethernet hard_header_len */ + IEEE80211_ENCRYPT_HEADROOM; ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM; |