From 22cdc9b32ee4fc4ce997f69ef7b4549ac95a1434 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 19 Jul 2014 15:05:11 +0200 Subject: backports: add some ubuntu trusty specific changes It is now possible to detect a ubuntu kernel see: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1327619 This uses the new define and adds some code depending on the ubuntu trusty kernel. Signed-off-by: Hauke Mehrtens --- .../network/0028-select_queue/mac80211.patch | 10 ++++++---- .../network/0028-select_queue/mwifiex.patch | 5 +++-- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'patches/collateral-evolutions/network/0028-select_queue') diff --git a/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch b/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch index 12eea54c..5b54658b 100644 --- a/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch +++ b/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch @@ -1,10 +1,11 @@ --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c -@@ -1071,10 +1071,19 @@ static void ieee80211_uninit(struct net_ +@@ -1072,10 +1072,20 @@ static void ieee80211_uninit(struct net_ ieee80211_teardown_sdata(IEEE80211_DEV_TO_SUB_IF(dev)); } -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0) || \ ++ (LINUX_VERSION_CODE == KERNEL_VERSION(3,13,11) && UTS_UBUNTU_RELEASE_ABI > 30) static u16 ieee80211_netdev_select_queue(struct net_device *dev, struct sk_buff *skb, void *accel_priv, @@ -20,11 +21,12 @@ { return ieee80211_select_queue(IEEE80211_DEV_TO_SUB_IF(dev), skb); } -@@ -1090,10 +1099,19 @@ static const struct net_device_ops ieee8 +@@ -1091,10 +1101,20 @@ static const struct net_device_ops ieee8 .ndo_select_queue = ieee80211_netdev_select_queue, }; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0) || \ ++ (LINUX_VERSION_CODE == KERNEL_VERSION(3,13,11) && UTS_UBUNTU_RELEASE_ABI > 30) static u16 ieee80211_monitor_select_queue(struct net_device *dev, struct sk_buff *skb, void *accel_priv, diff --git a/patches/collateral-evolutions/network/0028-select_queue/mwifiex.patch b/patches/collateral-evolutions/network/0028-select_queue/mwifiex.patch index f7222926..bf609811 100644 --- a/patches/collateral-evolutions/network/0028-select_queue/mwifiex.patch +++ b/patches/collateral-evolutions/network/0028-select_queue/mwifiex.patch @@ -1,10 +1,11 @@ --- a/drivers/net/wireless/mwifiex/main.c +++ b/drivers/net/wireless/mwifiex/main.c -@@ -745,9 +745,18 @@ static struct net_device_stats *mwifiex_ +@@ -744,9 +744,19 @@ static struct net_device_stats *mwifiex_ return &priv->stats; } -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0) || \ ++ (LINUX_VERSION_CODE == KERNEL_VERSION(3,13,11) && UTS_UBUNTU_RELEASE_ABI > 30) static u16 mwifiex_netdev_select_wmm_queue(struct net_device *dev, struct sk_buff *skb, void *accel_priv, select_queue_fallback_t fallback) -- cgit v1.2.3