diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2014-05-01 00:10:25 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-06-17 21:41:11 +0200 |
| commit | 939b4cfa86155c712f06254492e4f1c89582475e (patch) | |
| tree | 076d7bffe4410916adcc77f965764e11ba095d0d | |
| parent | d30a6ea401faf684ea4298afe2990f7f67d6e502 (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/0028-select_queue/mac80211.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch b/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch index 2e695f5b..d21a56b7 100644 --- a/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch +++ b/patches/collateral-evolutions/network/0028-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, |