driver: ipvlan: Remove unnecessary ipvlan NULL check in ipvlan_count_rx
authorGao Feng <fgao@ikuai8.com>
Wed, 28 Dec 2016 08:47:42 +0000 (16:47 +0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 28 Dec 2016 19:23:22 +0000 (14:23 -0500)
There are three functions which would invoke the ipvlan_count_rx. They
are ipvlan_process_multicast, ipvlan_rcv_frame, and ipvlan_nf_input.
The former two functions already use the ipvlan directly before
ipvlan_count_rx, and ipvlan_nf_input gets the ipvlan from
ipvl_addr->master, it is not possible to be NULL too.
So the ipvlan pointer check is unnecessary in ipvlan_count_rx.

Signed-off-by: Gao Feng <fgao@ikuai8.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ipvlan/ipvlan_core.c

index 83ce74acf82d5e08676cb0d796aac1fe1b524071..8ae335d73d3886a0f7a91f55a428059120288de6 100644 (file)
@@ -19,9 +19,6 @@ void ipvlan_init_secret(void)
 static void ipvlan_count_rx(const struct ipvl_dev *ipvlan,
                            unsigned int len, bool success, bool mcast)
 {
-       if (!ipvlan)
-               return;
-
        if (likely(success)) {
                struct ipvl_pcpu_stats *pcptr;