Backports Archive on lore.kernel.org
 help / Atom feed
From: Arend van Spriel <arend.vanspriel@broadcom.com>
To: backports@vger.kernel.org
Cc: Arend van Spriel <arend.vanspriel@broadcom.com>
Subject: [PATCH 1/3] patches: update select queue patches
Date: Sun, 31 Mar 2019 23:12:40 +0200
Message-ID: <1554066762-20128-1-git-send-email-arend.vanspriel@broadcom.com> (raw)

The select queue parameters changed so the patches need to be updated
as well.

Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
---
 patches/0028-select_queue/mac80211.patch  | 14 ++++++--------
 patches/0028-select_queue/mwifiex.patch   |  7 +++----
 patches/0028-select_queue/rtl8188eu.patch |  7 +++----
 patches/0028-select_queue/rtl8723bs.patch |  9 ++++-----
 4 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/patches/0028-select_queue/mac80211.patch b/patches/0028-select_queue/mac80211.patch
index bca6793..b77cee8 100644
--- a/patches/0028-select_queue/mac80211.patch
+++ b/patches/0028-select_queue/mac80211.patch
@@ -1,14 +1,13 @@
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
-@@ -1131,10 +1131,25 @@ static void ieee80211_uninit(struct net_
+@@ -1131,9 +1131,24 @@ static void ieee80211_uninit(struct net_
  	ieee80211_teardown_sdata(IEEE80211_DEV_TO_SUB_IF(dev));
  }
- 
+
 +#if 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)
+ 					 struct net_device *sb_dev)
 +#elif LINUX_VERSION_IS_GEQ(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,
@@ -26,15 +25,14 @@
  {
  	return ieee80211_select_queue(IEEE80211_DEV_TO_SUB_IF(dev), skb);
  }
-@@ -1177,10 +1192,25 @@ static const struct net_device_ops ieee8
+@@ -1176,9 +1191,24 @@ static const struct net_device_ops ieee8
  	.ndo_get_stats64	= ieee80211_get_stats64,
  };
- 
+
 +#if LINUX_VERSION_IS_GEQ(4,19,0)
  static u16 ieee80211_monitor_select_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(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,
diff --git a/patches/0028-select_queue/mwifiex.patch b/patches/0028-select_queue/mwifiex.patch
index 87159fa..9a5692e 100644
--- a/patches/0028-select_queue/mwifiex.patch
+++ b/patches/0028-select_queue/mwifiex.patch
@@ -1,14 +1,13 @@
 --- 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,23 @@ static struct net_device_stats *mwifiex_
  	return &priv->stats;
  }
- 
+
 +#if 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)
+ 				struct net_device *sb_dev)
 +#elif LINUX_VERSION_IS_GEQ(3,14,0) || \
 +    (LINUX_VERSION_CODE == KERNEL_VERSION(3,13,11) && UTS_UBUNTU_RELEASE_ABI > 30)
 +static u16
diff --git a/patches/0028-select_queue/rtl8188eu.patch b/patches/0028-select_queue/rtl8188eu.patch
index 90ddb85..5bf4984 100644
--- a/patches/0028-select_queue/rtl8188eu.patch
+++ b/patches/0028-select_queue/rtl8188eu.patch
@@ -1,13 +1,12 @@
 --- a/drivers/staging/rtl8188eu/os_dep/os_intfs.c
 +++ b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
-@@ -244,9 +244,15 @@ static unsigned int rtw_classify8021d(st
+@@ -244,8 +244,14 @@ static unsigned int rtw_classify8021d(st
  	return dscp >> 5;
  }
- 
+
 +#if LINUX_VERSION_IS_GEQ(4,19,0)
  static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb,
- 			    struct net_device *sb_dev,
- 			    select_queue_fallback_t fallback)
+ 			    struct net_device *sb_dev)
 +#else
 +static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb,
 +			    void *accel_priv,
diff --git a/patches/0028-select_queue/rtl8723bs.patch b/patches/0028-select_queue/rtl8723bs.patch
index 7dbf7f6..5b6f006 100644
--- a/patches/0028-select_queue/rtl8723bs.patch
+++ b/patches/0028-select_queue/rtl8723bs.patch
@@ -1,13 +1,12 @@
 --- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
 +++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
-@@ -403,9 +403,15 @@ static unsigned int rtw_classify8021d(st
+@@ -403,8 +403,14 @@ static unsigned int rtw_classify8021d(st
  }
- 
- 
+
+
 +#if LINUX_VERSION_IS_GEQ(4,19,0)
  static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb,
- 			    struct net_device *sb_dev,
- 			    select_queue_fallback_t fallback)
+ 			    struct net_device *sb_dev)
 +#else
 +static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb,
 +			    void *accel_priv,
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe backports" in

             reply index

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-31 21:12 Arend van Spriel [this message]
2019-03-31 21:12 ` [PATCH 2/3] backport: add policy field in struct genl_family Arend van Spriel
2019-03-31 21:12 ` [PATCH 3/3] backport: rcupdate: add rcu_head_init and rcu_head_after_call_rcu Arend van Spriel

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1554066762-20128-1-git-send-email-arend.vanspriel@broadcom.com \
    --to=arend.vanspriel@broadcom.com \
    --cc=backports@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Backports Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/backports/0 backports/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 backports backports/ https://lore.kernel.org/backports \
		backports@vger.kernel.org backports@archiver.kernel.org
	public-inbox-index backports


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.backports


AGPL code for this site: git clone https://public-inbox.org/ public-inbox