| Message ID | 20210805115434.19248-1-yajun.deng@linux.dev (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b37a466837393af72fe8bcb8f1436410f3f173f3 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] netdevice: add the case if dev is NULL | expand |
| Context | Check | Description |
|---|---|---|
| netdev/apply | success | Patch already applied to net-next |
| netdev/tree_selection | success | Clearly marked for net-next |
Hello: This patch was applied to netdev/net-next.git (refs/heads/master): On Thu, 5 Aug 2021 19:54:34 +0800 you wrote: > 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> > --- > include/linux/netdevice.h | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) Here is the summary with links: - [net-next] netdevice: add the case if dev is NULL https://git.kernel.org/netdev/net-next/c/b37a46683739 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 1b4d4509d04b..135c943699d0 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -4143,11 +4143,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 + } } /** @@ -4158,11 +4160,13 @@ static inline void dev_put(struct net_device *dev) */ 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
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> --- include/linux/netdevice.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)