Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d420895e authored Jun 27, 2008 by YOSHIFUJI Hideaki Committed by David S. Miller Jun 27, 2008

ipv6 route: Convert rt6_device_match() to use RT6_LOOKUP_F_xxx flags.



The commit 77d16f45 ("[IPV6] ROUTE:
Unify RT6_F_xxx and RT6_SELECT_F_xxx flags") intended to pass various
routing lookup hints around RT6_LOOKUP_F_xxx flags, but conversion was
missing for rt6_device_match().

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 59d88c00

net/ipv6/route.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -240,7 +240,7 @@ static inline int rt6_need_strict(struct in6_addr *daddr)
		static inline struct rt6_info rt6_device_match(struct net net,
		struct rt6_info *rt,
		int oif,
		int strict)
		int flags)
		{
		struct rt6_info *local = NULL;
		struct rt6_info *sprt;
		@@ -253,7 +253,7 @@ static inline struct rt6_info rt6_device_match(struct net net,
		if (dev->flags & IFF_LOOPBACK) {
		if (sprt->rt6i_idev == NULL \|\|
		sprt->rt6i_idev->dev->ifindex != oif) {
		if (strict && oif)
		if (flags & RT6_LOOKUP_F_IFACE && oif)
		continue;
		if (local && (!oif \|\|
		local->rt6i_idev->dev->ifindex == oif))
		@@ -266,7 +266,7 @@ static inline struct rt6_info rt6_device_match(struct net net,
		if (local)
		return local;

		if (strict)
		if (flags & RT6_LOOKUP_F_IFACE)
		return net->ipv6.ip6_null_entry;
		}
		return rt;