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 <vulab@iscas.ac.cn>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ipvlan/ipvlan_core.c b/drivers/net/ipvlan/ipvlan_core.c
index 6cd50106e61120066b02909b068b6d4f1ae04872..c613900c3811f9e0482092f79bad3bf9cfab25b3 100644 (file)
--- 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 20da0b2bd246cc3000d44d126c87cfc6fa5ad99f..696e245f6d009d4d5d4a9c3523e4aa1e5d0f8bb6 100644 (file)
--- 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);