diff mbox series

[63/74] backports: update 0028-select_queue/mac80211.patch

Message ID 20240524190907.47b2dd588aa1.Ie02c93aec74e8fa7125a1620808a6093c23cdeb3@changeid (mailing list archive)
State New
Headers show
Series backport updates from Intel | expand

Commit Message

Johannes Berg May 24, 2024, 5:08 p.m. UTC 
From: Gregory Greenman <gregory.greenman@intel.com>

The code in net/mac80211/iface.c changed, commit
107395f9cf44 ("wifi: mac80211: Drop support for TX push path")
removed the code referenced by the patch. Fix mac80211.patch
accordingly.

Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 patches/0028-select_queue/mac80211.patch | 22 ----------------------
 1 file changed, 22 deletions(-)
diff mbox series

Patch

diff --git a/patches/0028-select_queue/mac80211.patch b/patches/0028-select_queue/mac80211.patch
index 64a397b96280..d2f2c8c13da8 100644
--- a/patches/0028-select_queue/mac80211.patch
+++ b/patches/0028-select_queue/mac80211.patch
@@ -1,27 +1,5 @@ 
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
-@@ -697,9 +697,21 @@ static void ieee80211_uninit(struct net_
- 	ieee80211_teardown_sdata(IEEE80211_DEV_TO_SUB_IF(dev));
- }
- 
-+#if LINUX_VERSION_IS_GEQ(5,2,0)
- static u16 ieee80211_netdev_select_queue(struct net_device *dev,
- 					 struct sk_buff *skb,
- 					 struct net_device *sb_dev)
-+#elif LINUX_VERSION_IS_GEQ(4,19,0)
-+static u16 ieee80211_netdev_select_queue(struct net_device *dev,
-+					 struct sk_buff *skb,
-+					 struct net_device *sb_dev,
-+					 select_queue_fallback_t fallback)
-+#else
-+static u16 ieee80211_netdev_select_queue(struct net_device *dev,
-+					 struct sk_buff *skb,
-+					 void *accel_priv,
-+					 select_queue_fallback_t fallback)
-+#endif
- {
- 	return ieee80211_select_queue(IEEE80211_DEV_TO_SUB_IF(dev), skb);
- }
 @@ -721,9 +733,21 @@ static const struct net_device_ops ieee8
  	.ndo_get_stats64	= ieee80211_get_stats64,
  };