2021-12-02 07:54:44

by Xu Wang

Subject: [PATCH] ipvlan: Remove redundant if statements

The 'if (dev)' statement already move into dev_{put , hold}, so remove
redundant if statements.

Signed-off-by: Xu Wang <[email protected]>
---
drivers/net/ipvlan/ipvlan_core.c | 3 +--
drivers/net/ipvlan/ipvlan_main.c | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ipvlan/ipvlan_core.c b/drivers/net/ipvlan/ipvlan_core.c
index 6cd50106e611..c613900c3811 100644
--- a/drivers/net/ipvlan/ipvlan_core.c
+++ b/drivers/net/ipvlan/ipvlan_core.c
@@ -291,8 +291,7 @@ void ipvlan_process_multicast(struct work_struct *work)
else
kfree_skb(skb);
}
- if (dev)
- dev_put(dev);
+ dev_put(dev);
cond_resched();
}
}
diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c
index 1d2f4e7d7324..e90518952db9 100644
--- a/drivers/net/ipvlan/ipvlan_main.c
+++ b/drivers/net/ipvlan/ipvlan_main.c
@@ -100,8 +100,7 @@ static void ipvlan_port_destroy(struct net_device *dev)
netdev_rx_handler_unregister(dev);
cancel_work_sync(&port->wq);
while ((skb = __skb_dequeue(&port->backlog)) != NULL) {
- if (skb->dev)
- dev_put(skb->dev);
+ dev_put(skb->dev);
kfree_skb(skb);
}
ida_destroy(&port->ida);
--
2.25.1

2021-12-02 13:10:21

by patchwork-bot+netdevbpf

Subject: Re: [PATCH] ipvlan: Remove redundant if statements

Hello:

This patch was applied to netdev/net-next.git (master)
by David S. Miller <[email protected]>:

On Thu, 2 Dec 2021 07:53:59 +0000 you wrote:
> The 'if (dev)' statement already move into dev_{put , hold}, so remove
> redundant if statements.
>
> Signed-off-by: Xu Wang <[email protected]>
> ---
> drivers/net/ipvlan/ipvlan_core.c | 3 +--
> drivers/net/ipvlan/ipvlan_main.c | 3 +--
> 2 files changed, 2 insertions(+), 4 deletions(-)

Here is the summary with links:
- ipvlan: Remove redundant if statements
https://git.kernel.org/netdev/net-next/c/0c4789460e8c

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html