diff options
| author |   David Ahern <dsa@cumulusnetworks.com> | 2015-09-25 15:22:54 -0600 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-09-28 22:30:24 -0700 |
| commit | 17fb0b2b90568182bc969cbe0d76fa07079267e4 (patch) | |
| tree | e5cd9db6ddfa5dc989e37baa87671af97f2c9f71 /net/ipv6 | |
| parent | lan78xx: Return 0 when lan78xx_suspend() has no error. (diff) | |
| download | linux-dev-17fb0b2b90568182bc969cbe0d76fa07079267e4.tar.xz linux-dev-17fb0b2b90568182bc969cbe0d76fa07079267e4.zip | |
net: Remove redundant oif checks in rt6_device_match
The oif has already been checked that it is non-zero; the 2 additional
checks on oif within that if (oif) {...} block are redundant.
CC: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/route.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 6fbf6fdde7e7..66a6b2c485dd 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -474,10 +474,10 @@ static inline struct rt6_info *rt6_device_match(struct net *net, if (dev->flags & IFF_LOOPBACK) { if (!sprt->rt6i_idev || sprt->rt6i_idev->dev->ifindex != oif) { - if (flags & RT6_LOOKUP_F_IFACE && oif) + if (flags & RT6_LOOKUP_F_IFACE) continue; - if (local && (!oif || - local->rt6i_idev->dev->ifindex == oif)) + if (local && + local->rt6i_idev->dev->ifindex == oif) continue; } local = sprt; |