Message ID | 1482914862-2793-1-git-send-email-fgao@ikuai8.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: fgao@ikuai8.com Date: Wed, 28 Dec 2016 16:47:42 +0800 > From: Gao Feng <fgao@ikuai8.com> > > 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> Applied.
diff --git a/drivers/net/ipvlan/ipvlan_core.c b/drivers/net/ipvlan/ipvlan_core.c index b4e9907..082f9f1 100644 --- a/drivers/net/ipvlan/ipvlan_core.c +++ b/drivers/net/ipvlan/ipvlan_core.c @@ -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;