diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2014-05-01 00:10:25 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-10-25 15:20:13 +0200 |
| commit | 811496c389150d9ff456b51d0affcb991b74619a (patch) | |
| tree | 717dca124fda95cc004ff35a2902632ff2a6c060 | |
| parent | 369d49a955f325dcc9aa64e97999ab5e22dcf845 (diff) | |
backports: select_queue patch: fix callback kernel version
Upstream commit: 44554cd57d0016c52aeed2ce4f27081b9d9c915f
The callback argument has been passed since kernel 3.14, not
only 3.15 - fix that.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
| -rw-r--r-- | patches/collateral-evolutions/network/83-select_queue/mac80211.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/collateral-evolutions/network/83-select_queue/mac80211.patch b/patches/collateral-evolutions/network/83-select_queue/mac80211.patch index f22e3b87..967d7f7b 100644 --- a/patches/collateral-evolutions/network/83-select_queue/mac80211.patch +++ b/patches/collateral-evolutions/network/83-select_queue/mac80211.patch @@ -6,7 +6,7 @@ index 088111a..dcf149a 100644 ieee80211_teardown_sdata(IEEE80211_DEV_TO_SUB_IF(dev)); } -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0) static u16 ieee80211_netdev_select_queue(struct net_device *dev, struct sk_buff *skb, void *accel_priv, @@ -26,7 +26,7 @@ index 088111a..dcf149a 100644 .ndo_select_queue = ieee80211_netdev_select_queue, }; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0) static u16 ieee80211_monitor_select_queue(struct net_device *dev, struct sk_buff *skb, void *accel_priv, |