]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
netdevice: add the case if dev is NULL
authorYajun Deng <yajun.deng@linux.dev>
Thu, 5 Aug 2021 11:54:34 +0000 (19:54 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 8 Apr 2022 12:39:47 +0000 (14:39 +0200)
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

index 861f2480c45715f0c7e8347f033e02f8ba4ba836..ed2d5314000517d479f3afea4a37fe1cbe8a94da 100644 (file)
@@ -3980,7 +3980,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);
 }
 
 /**
@@ -3991,7 +3992,8 @@ static inline void dev_put(struct net_device *dev)
  */
 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