diff options
Diffstat (limited to 'patches/collateral-evolutions/network/83-select_queue')
| -rw-r--r-- | patches/collateral-evolutions/network/83-select_queue/mac80211.patch | 24 | ||||
| -rw-r--r-- | patches/collateral-evolutions/network/83-select_queue/mwifiex.patch | 12 |
2 files changed, 25 insertions, 11 deletions
diff --git a/patches/collateral-evolutions/network/83-select_queue/mac80211.patch b/patches/collateral-evolutions/network/83-select_queue/mac80211.patch index eb90b42c..ce087ccc 100644 --- a/patches/collateral-evolutions/network/83-select_queue/mac80211.patch +++ b/patches/collateral-evolutions/network/83-select_queue/mac80211.patch @@ -1,15 +1,20 @@ diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c -index 3dfd20a..0696aec 100644 +index 088111a..dcf149a 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c -@@ -1065,9 +1065,14 @@ static void ieee80211_uninit(struct net_ +@@ -1067,10 +1067,19 @@ static void ieee80211_uninit(struct net_ ieee80211_teardown_sdata(IEEE80211_DEV_TO_SUB_IF(dev)); } -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0) static u16 ieee80211_netdev_select_queue(struct net_device *dev, struct sk_buff *skb, - void *accel_priv) + void *accel_priv, + select_queue_fallback_t fallback) ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0) ++static u16 ieee80211_netdev_select_queue(struct net_device *dev, ++ struct sk_buff *skb, ++ void *accel_priv) +#else +static u16 ieee80211_netdev_select_queue(struct net_device *dev, + struct sk_buff *skb) @@ -17,14 +22,19 @@ index 3dfd20a..0696aec 100644 { return ieee80211_select_queue(IEEE80211_DEV_TO_SUB_IF(dev), skb); } -@@ -1083,9 +1088,14 @@ static const struct net_device_ops ieee8 +@@ -1086,10 +1095,19 @@ static const struct net_device_ops ieee8 .ndo_select_queue = ieee80211_netdev_select_queue, }; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0) static u16 ieee80211_monitor_select_queue(struct net_device *dev, struct sk_buff *skb, - void *accel_priv) + void *accel_priv, + select_queue_fallback_t fallback) ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0) ++static u16 ieee80211_monitor_select_queue(struct net_device *dev, ++ struct sk_buff *skb, ++ void *accel_priv) +#else +static u16 ieee80211_monitor_select_queue(struct net_device *dev, + struct sk_buff *skb) diff --git a/patches/collateral-evolutions/network/83-select_queue/mwifiex.patch b/patches/collateral-evolutions/network/83-select_queue/mwifiex.patch index 78292d2b..db9ed6e5 100644 --- a/patches/collateral-evolutions/network/83-select_queue/mwifiex.patch +++ b/patches/collateral-evolutions/network/83-select_queue/mwifiex.patch @@ -1,15 +1,19 @@ diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c -index 4d79761..8bd0316 100644 +index 9d3d275..f8b16f4 100644 --- a/drivers/net/wireless/mwifiex/main.c +++ b/drivers/net/wireless/mwifiex/main.c -@@ -746,9 +746,14 @@ static struct net_device_stats *mwifiex_ +@@ -746,9 +746,18 @@ static struct net_device_stats *mwifiex_ return &priv->stats; } -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0) static u16 mwifiex_netdev_select_wmm_queue(struct net_device *dev, struct sk_buff *skb, - void *accel_priv) + void *accel_priv, select_queue_fallback_t fallback) ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0) ++static u16 ++mwifiex_netdev_select_wmm_queue(struct net_device *dev, struct sk_buff *skb, ++ void *accel_priv) +#else +static u16 +mwifiex_netdev_select_wmm_queue(struct net_device *dev, struct sk_buff *skb) |