aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGao Feng <fgao@ikuai8.com>2016-12-28 16:47:42 +0800
committerDavid S. Miller <davem@davemloft.net>2016-12-28 14:23:22 -0500
commit3ea35d3406d31a7389c2a299e28168c52040843a (patch)
treee3ff6f910b37da8f846d8559e41eeeaab3d132ef
parentdriver: ipvlan: Define common functions to decrease duplicated codes used to add or del IP address (diff)
downloadlinux-dev-3ea35d3406d31a7389c2a299e28168c52040843a.tar.xz
linux-dev-3ea35d3406d31a7389c2a299e28168c52040843a.zip
driver: ipvlan: Remove unnecessary ipvlan NULL check in ipvlan_count_rx
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>
-rw-r--r--drivers/net/ipvlan/ipvlan_core.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/ipvlan/ipvlan_core.c b/drivers/net/ipvlan/ipvlan_core.c
index 83ce74acf82d..8ae335d73d38 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;