backports.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/3] patches: update select queue patches
@ 2019-03-31 21:12 Arend van Spriel
  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
  0 siblings, 2 replies; 3+ messages in thread
From: Arend van Spriel @ 2019-03-31 21:12 UTC (permalink / raw)
  To: backports; +Cc: Arend van Spriel

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

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [PATCH 2/3] backport: add policy field in struct genl_family
  2019-03-31 21:12 [PATCH 1/3] patches: update select queue patches Arend van Spriel
@ 2019-03-31 21:12 ` 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
  1 sibling, 0 replies; 3+ messages in thread
From: Arend van Spriel @ 2019-03-31 21:12 UTC (permalink / raw)
  To: backports; +Cc: Arend van Spriel

Commit 3b0f31f2b8c9 ("genetlink: make policy common to family") added
a common policy to the genl_family. So we need it in backport as well.
As the backport explicitly sets ops policy to NULL no further changes
are needed.

Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
---
 backport/backport-include/net/genetlink.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backport/backport-include/net/genetlink.h b/backport/backport-include/net/genetlink.h
index 84011e7..1b5f4e1 100644
--- a/backport/backport-include/net/genetlink.h
+++ b/backport/backport-include/net/genetlink.h
@@ -115,6 +115,7 @@ struct backport_genl_family {
 	unsigned int		maxattr;
 	bool			netnsok;
 	bool			parallel_ops;
+	const struct nla_policy *policy;
 	int			(*pre_doit)(__genl_const struct genl_ops *ops,
 					    struct sk_buff *skb,
 					    struct genl_info *info);
-- 
1.9.1

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

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [PATCH 3/3] backport: rcupdate: add rcu_head_init and rcu_head_after_call_rcu
  2019-03-31 21:12 [PATCH 1/3] patches: update select queue patches Arend van Spriel
  2019-03-31 21:12 ` [PATCH 2/3] backport: add policy field in struct genl_family Arend van Spriel
@ 2019-03-31 21:12 ` Arend van Spriel
  1 sibling, 0 replies; 3+ messages in thread
From: Arend van Spriel @ 2019-03-31 21:12 UTC (permalink / raw)
  To: backports; +Cc: Arend van Spriel

Include static inline functions that were added by commit
74de6960c99d ("rcu: Provide functions for determining if call_rcu()
has been invoked").

Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
---
 backport/backport-include/linux/rcupdate.h | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/backport/backport-include/linux/rcupdate.h b/backport/backport-include/linux/rcupdate.h
index b96ef49..8b9c94e 100644
--- a/backport/backport-include/linux/rcupdate.h
+++ b/backport/backport-include/linux/rcupdate.h
@@ -41,4 +41,22 @@
 #define rcu_dereference_raw(p)	rcu_dereference(p)
 #endif
 
+#if LINUX_VERSION_IS_LESS(5,2,0)
+typedef void (*rcu_callback_t)(struct rcu_head *head);
+
+static inline void rcu_head_init(struct rcu_head *rhp)
+{
+        rhp->func = (rcu_callback_t)~0L;
+}
+
+static inline bool
+rcu_head_after_call_rcu(struct rcu_head *rhp, rcu_callback_t f)
+{
+        if (READ_ONCE(rhp->func) == f)
+                return true;
+        WARN_ON_ONCE(READ_ONCE(rhp->func) != (rcu_callback_t)~0L);
+        return false;
+}
+#endif
+
 #endif /* __BACKPORT_LINUX_RCUPDATE_H */
-- 
1.9.1

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

^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-03-31 21:13 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-31 21:12 [PATCH 1/3] patches: update select queue patches Arend van Spriel
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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).