4.9-stable patches

added patches:
	netdevice-add-the-case-if-dev-is-null.patch

diff --git a/queue-4.9/netdevice-add-the-case-if-dev-is-null.patch b/queue-4.9/netdevice-add-the-case-if-dev-is-null.patch
new file mode 100644 (file)
index 0000000..c9e9e42
--- /dev/null
+++ b/queue-4.9/netdevice-add-the-case-if-dev-is-null.patch
@@ -0,0 +1,42 @@
+From b37a466837393af72fe8bcb8f1436410f3f173f3 Mon Sep 17 00:00:00 2001
+From: Yajun Deng <yajun.deng@linux.dev>
+Date: Thu, 5 Aug 2021 19:54:34 +0800
+Subject: netdevice: add the case if dev is NULL
+
+From: Yajun Deng <yajun.deng@linux.dev>
+
+commit b37a466837393af72fe8bcb8f1436410f3f173f3 upstream.
+
+Add the case if dev is NULL in dev_{put, hold}, so the caller doesn't
+need to care whether dev is NULL or not.
+
+Signed-off-by: Yajun Deng <yajun.deng@linux.dev>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Cc: Pavel Machek <pavel@denx.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ include/linux/netdevice.h |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/include/linux/netdevice.h
++++ b/include/linux/netdevice.h
+@@ -3410,7 +3410,8 @@ void netdev_run_todo(void);
+  */
+ static inline void dev_put(struct net_device *dev)
+ {
+-      this_cpu_dec(*dev->pcpu_refcnt);
++      if (dev)
++              this_cpu_dec(*dev->pcpu_refcnt);
+ }
+ 
+ /**
+@@ -3421,7 +3422,8 @@ static inline void dev_put(struct net_de
+  */
+ static inline void dev_hold(struct net_device *dev)
+ {
+-      this_cpu_inc(*dev->pcpu_refcnt);
++      if (dev)
++              this_cpu_inc(*dev->pcpu_refcnt);
+ }
+ 
+ /* Carrier loss detection, dial on demand. The functions netif_carrier_on

diff --git a/queue-4.9/series b/queue-4.9/series
index 2ef59a86f05150cddd9277597744c01ef7334a11..8df3e8e8682696eab21505a91e6bb3673dadd864 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -1,2 +1,3 @@
 usb-serial-pl2303-add-ibm-device-ids.patch
 usb-serial-simple-add-nokia-phone-driver.patch
+netdevice-add-the-case-if-dev-is-null.patch