diff options
author | Pavel Emelyanov <xemul@parallels.com> | 2012-08-08 17:53:36 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-08-09 19:18:07 -0400 |
commit | 1fb9489bf190ce2b3fc03891f3de4b2d30600e28 (patch) | |
tree | da4e17036949e72ae0b1f0fc3b6b31557de18353 /net/decnet | |
parent | aa79e66eee5d525e2fcbd2a5fcb87ae3dd4aa9e9 (diff) |
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: Pavel Emelyanov <xemul@parallels.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/decnet')
-rw-r--r-- | net/decnet/dn_route.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c index 85a3604c87c8..c855e8d0738f 100644 --- a/net/decnet/dn_route.c +++ b/net/decnet/dn_route.c | |||
@@ -961,7 +961,7 @@ static int dn_route_output_slow(struct dst_entry **pprt, const struct flowidn *o | |||
961 | .saddr = oldflp->saddr, | 961 | .saddr = oldflp->saddr, |
962 | .flowidn_scope = RT_SCOPE_UNIVERSE, | 962 | .flowidn_scope = RT_SCOPE_UNIVERSE, |
963 | .flowidn_mark = oldflp->flowidn_mark, | 963 | .flowidn_mark = oldflp->flowidn_mark, |
964 | .flowidn_iif = init_net.loopback_dev->ifindex, | 964 | .flowidn_iif = LOOPBACK_IFINDEX, |
965 | .flowidn_oif = oldflp->flowidn_oif, | 965 | .flowidn_oif = oldflp->flowidn_oif, |
966 | }; | 966 | }; |
967 | struct dn_route *rt = NULL; | 967 | struct dn_route *rt = NULL; |
@@ -979,7 +979,7 @@ static int dn_route_output_slow(struct dst_entry **pprt, const struct flowidn *o | |||
979 | "dn_route_output_slow: dst=%04x src=%04x mark=%d" | 979 | "dn_route_output_slow: dst=%04x src=%04x mark=%d" |
980 | " iif=%d oif=%d\n", le16_to_cpu(oldflp->daddr), | 980 | " iif=%d oif=%d\n", le16_to_cpu(oldflp->daddr), |
981 | le16_to_cpu(oldflp->saddr), | 981 | le16_to_cpu(oldflp->saddr), |
982 | oldflp->flowidn_mark, init_net.loopback_dev->ifindex, | 982 | oldflp->flowidn_mark, LOOPBACK_IFINDEX, |
983 | oldflp->flowidn_oif); | 983 | oldflp->flowidn_oif); |
984 | 984 | ||
985 | /* If we have an output interface, verify its a DECnet device */ | 985 | /* If we have an output interface, verify its a DECnet device */ |
@@ -1042,7 +1042,7 @@ source_ok: | |||
1042 | if (!fld.daddr) | 1042 | if (!fld.daddr) |
1043 | goto out; | 1043 | goto out; |
1044 | } | 1044 | } |
1045 | fld.flowidn_oif = init_net.loopback_dev->ifindex; | 1045 | fld.flowidn_oif = LOOPBACK_IFINDEX; |
1046 | res.type = RTN_LOCAL; | 1046 | res.type = RTN_LOCAL; |
1047 | goto make_route; | 1047 | goto make_route; |
1048 | } | 1048 | } |