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

Commit 1fb9489b authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

net: Loopback ifindex is constant now 



As pointed out, there are places, that access net->loopback_dev->ifindex
and after ifindex generation is made per-net this value becomes constant
equals 1. So go ahead and introduce the LOOPBACK_IFINDEX constant and use
it where appropriate.

Signed-off-by: default avatarPavel Emelyanov <xemul@parallels.com>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent aa79e66e

drivers/net/loopback.c

+1 −0
Original line number Diff line number Diff line
@@ -197,6 +197,7 @@ static __net_init int loopback_net_init(struct net *net) 
	if (err)

		goto out_free_netdev;



	BUG_ON(dev->ifindex != LOOPBACK_IFINDEX);

	net->loopback_dev = dev;

	return 0;

include/net/net_namespace.h

+7 −0
Original line number Diff line number Diff line
@@ -105,6 +105,13 @@ struct net { 
	struct sock		*diag_nlsk;

};



/*

 * ifindex generation is per-net namespace, and loopback is

 * always the 1st device in ns (see net_dev_init), thus any

 * loopback device should get ifindex 1

 */



#define LOOPBACK_IFINDEX	1



#include <linux/seq_file_net.h>

net/decnet/dn_route.c

+3 −3
Original line number Diff line number Diff line
@@ -961,7 +961,7 @@ static int dn_route_output_slow(struct dst_entry **pprt, const struct flowidn *o 
		.saddr = oldflp->saddr,

		.flowidn_scope = RT_SCOPE_UNIVERSE,

		.flowidn_mark = oldflp->flowidn_mark,

		.flowidn_iif = init_net.loopback_dev->ifindex,

		.flowidn_iif = LOOPBACK_IFINDEX,

		.flowidn_oif = oldflp->flowidn_oif,

	};

	struct dn_route *rt = NULL;
@@ -979,7 +979,7 @@ static int dn_route_output_slow(struct dst_entry **pprt, const struct flowidn *o 
		       "dn_route_output_slow: dst=%04x src=%04x mark=%d"

		       " iif=%d oif=%d\n", le16_to_cpu(oldflp->daddr),

		       le16_to_cpu(oldflp->saddr),

		       oldflp->flowidn_mark, init_net.loopback_dev->ifindex,

		       oldflp->flowidn_mark, LOOPBACK_IFINDEX,

		       oldflp->flowidn_oif);



	/* If we have an output interface, verify its a DECnet device */
@@ -1042,7 +1042,7 @@ static int dn_route_output_slow(struct dst_entry **pprt, const struct flowidn *o 
			if (!fld.daddr)

				goto out;

		}

		fld.flowidn_oif = init_net.loopback_dev->ifindex;

		fld.flowidn_oif = LOOPBACK_IFINDEX;

		res.type = RTN_LOCAL;

		goto make_route;

	}

net/ipv4/fib_frontend.c

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ __be32 fib_compute_spec_dst(struct sk_buff *skb) 
	scope = RT_SCOPE_UNIVERSE;

	if (!ipv4_is_zeronet(ip_hdr(skb)->saddr)) {

		fl4.flowi4_oif = 0;

		fl4.flowi4_iif = net->loopback_dev->ifindex;

		fl4.flowi4_iif = LOOPBACK_IFINDEX;

		fl4.daddr = ip_hdr(skb)->saddr;

		fl4.saddr = 0;

		fl4.flowi4_tos = RT_TOS(ip_hdr(skb)->tos);

net/ipv4/ipmr.c

+1 −1
Original line number Diff line number Diff line
@@ -1798,7 +1798,7 @@ static struct mr_table *ipmr_rt_fib_lookup(struct net *net, struct sk_buff *skb) 
		.flowi4_oif = (rt_is_output_route(rt) ?

			       skb->dev->ifindex : 0),

		.flowi4_iif = (rt_is_output_route(rt) ?

			       net->loopback_dev->ifindex :

			       LOOPBACK_IFINDEX :

			       skb->dev->ifindex),

		.flowi4_mark = skb->mark,

	};