summaryrefslogtreecommitdiff
path: root/patches/0028-select_queue/mwifiex.patch
diff options
context:
space:
mode:
authorArend van Spriel <arend.vanspriel@broadcom.com>2019-03-31 23:12:40 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2019-06-26 22:58:18 +0200
commitab6761705d8f1d114058eb4a71f3e2e9cfdeeb9b (patch)
tree5e2f0b3511d803ef117eceb4a0f0a4d8f6ca2743 /patches/0028-select_queue/mwifiex.patch
parent2fee410fa7e3c618f8231a180971f7ae112cf8f9 (diff)
patches: update select queue patches
The select queue parameters changed so the patches need to be updated as well. Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com> [Fix compile on kernel > 4.19] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/0028-select_queue/mwifiex.patch')
-rw-r--r--patches/0028-select_queue/mwifiex.patch12
1 files changed, 8 insertions, 4 deletions
diff --git a/patches/0028-select_queue/mwifiex.patch b/patches/0028-select_queue/mwifiex.patch
index 87159fa9..8770aaf7 100644
--- a/patches/0028-select_queue/mwifiex.patch
+++ b/patches/0028-select_queue/mwifiex.patch
@@ -1,14 +1,18 @@
--- a/drivers/net/wireless/marvell/mwifiex/main.c
+++ b/drivers/net/wireless/marvell/mwifiex/main.c
-@@ -1280,10 +1280,24 @@ static struct net_device_stats *mwifiex_
+@@ -1280,9 +1280,28 @@ static struct net_device_stats *mwifiex_
return &priv->stats;
}
-+#if LINUX_VERSION_IS_GEQ(4,19,0)
++#if LINUX_VERSION_IS_GEQ(5,2,0)
static u16
mwifiex_netdev_select_wmm_queue(struct net_device *dev, struct sk_buff *skb,
- struct net_device *sb_dev,
- select_queue_fallback_t fallback)
+ struct net_device *sb_dev)
++#elif LINUX_VERSION_IS_GEQ(4,19,0)
++static u16
++mwifiex_netdev_select_wmm_queue(struct net_device *dev, struct sk_buff *skb,
++ struct net_device *sb_dev,
++ select_queue_fallback_t fallback)
+#elif LINUX_VERSION_IS_GEQ(3,14,0) || \
+ (LINUX_VERSION_CODE == KERNEL_VERSION(3,13,11) && UTS_UBUNTU_RELEASE_ABI > 30)
+static u16