diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-04-06 22:52:26 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-04-06 22:52:26 +0200 |
| commit | 4673b0b774de44d3f101bb677e2a44312a36f1b9 (patch) | |
| tree | c9cb07edab3d6c493aaa76141240cb5b32bc707b /patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom/mac80211.patch | |
| parent | 8f949091c3e0bd1ec75e44614b57c0fe3bc90e55 (diff) | |
backport patches: rename/combine some patches
It's not efficient to have a large number of patches,
but necessary to split patches per driver or subsystem
to allow copying only parts. I had split them per file
as that was easy to generate, now combine a few again
and move some into the higher directory level.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
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.patch | 18 |
1 files changed, 18 insertions, 0 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 new file mode 100644 index 00000000..2b6a8a46 --- /dev/null +++ b/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom/mac80211.patch @@ -0,0 +1,18 @@ +--- a/net/mac80211/iface.c ++++ b/net/mac80211/iface.c +@@ -1518,6 +1518,7 @@ int ieee80211_if_add(struct ieee80211_lo + return -ENOMEM; + dev_net_set(ndev, wiphy_net(local->hw.wiphy)); + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)) + 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 + - ETH_HLEN /* ethernet hard_header_len */ + + IEEE80211_ENCRYPT_HEADROOM; + ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM; ++#endif + + ret = dev_alloc_name(ndev, ndev->name); + if (ret < 0) { |