diff options
author | David S. Miller <davem@davemloft.net> | 2011-03-12 00:29:39 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-12 18:08:44 -0500 |
commit | 1d28f42c1bd4bb2363d88df74d0128b4da135b4a (patch) | |
tree | cb2e652fe79a2bc307e871bc2d3fa51cc8051e45 /net/decnet/dn_fib.c | |
parent | ca116922afa8cc5ad46b00c0a637b1cde5ca478a (diff) |
net: Put flowi_* prefix on AF independent members of struct flowi
I intend to turn struct flowi into a union of AF specific flowi
structs. There will be a common structure that each variant includes
first, much like struct sock_common.
This is the first step to move in that direction.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/decnet/dn_fib.c')
-rw-r--r-- | net/decnet/dn_fib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/decnet/dn_fib.c b/net/decnet/dn_fib.c index 0ef0a81bcd72..4dfffa0b67a8 100644 --- a/net/decnet/dn_fib.c +++ b/net/decnet/dn_fib.c | |||
@@ -223,7 +223,7 @@ static int dn_fib_check_nh(const struct rtmsg *r, struct dn_fib_info *fi, struct | |||
223 | 223 | ||
224 | memset(&fl, 0, sizeof(fl)); | 224 | memset(&fl, 0, sizeof(fl)); |
225 | fl.fld_dst = nh->nh_gw; | 225 | fl.fld_dst = nh->nh_gw; |
226 | fl.oif = nh->nh_oif; | 226 | fl.flowi_oif = nh->nh_oif; |
227 | fl.fld_scope = r->rtm_scope + 1; | 227 | fl.fld_scope = r->rtm_scope + 1; |
228 | 228 | ||
229 | if (fl.fld_scope < RT_SCOPE_LINK) | 229 | if (fl.fld_scope < RT_SCOPE_LINK) |
@@ -424,7 +424,7 @@ int dn_fib_semantic_match(int type, struct dn_fib_info *fi, const struct flowi * | |||
424 | for_nexthops(fi) { | 424 | for_nexthops(fi) { |
425 | if (nh->nh_flags & RTNH_F_DEAD) | 425 | if (nh->nh_flags & RTNH_F_DEAD) |
426 | continue; | 426 | continue; |
427 | if (!fl->oif || fl->oif == nh->nh_oif) | 427 | if (!fl->flowi_oif || fl->flowi_oif == nh->nh_oif) |
428 | break; | 428 | break; |
429 | } | 429 | } |
430 | if (nhsel < fi->fib_nhs) { | 430 | if (nhsel < fi->fib_nhs) { |