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

Patch-mainline: v5.15-rc1

Git-commit: b37a466837393af72fe8bcb8f1436410f3f173f3

References: bsc#1208628

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>

Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>

---

 include/linux/netdevice.h |   12 ++++++++----

 1 file changed, 8 insertions(+), 4 deletions(-)

--- a/include/linux/netdevice.h

+++ b/include/linux/netdevice.h

@@ -4130,11 +4130,13 @@ void netdev_run_todo(void);

  */

 static inline void dev_put(struct net_device *dev)

 {

+	if (dev) {

 #ifdef CONFIG_PCPU_DEV_REFCNT

-	this_cpu_dec(*dev->pcpu_refcnt);

+		this_cpu_dec(*dev->pcpu_refcnt);

 #else

-	refcount_dec(&dev->dev_refcnt);

+		refcount_dec(&dev->dev_refcnt);

 #endif

+	}

 }

 /**

@@ -4145,11 +4147,13 @@ static inline void dev_put(struct net_de

  */

 static inline void dev_hold(struct net_device *dev)

 {

+	if (dev) {

 #ifdef CONFIG_PCPU_DEV_REFCNT

-	this_cpu_inc(*dev->pcpu_refcnt);

+		this_cpu_inc(*dev->pcpu_refcnt);

 #else

-	refcount_inc(&dev->dev_refcnt);

+		refcount_inc(&dev->dev_refcnt);

 #endif

+	}

 }

 /* Carrier loss detection, dial on demand. The functions netif_carrier_on