diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-12 02:02:42 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-12 15:08:49 -0800 |
| commit | 9ade22861f922344788321e374c542c92bc049b6 (patch) | |
| tree | c0bc23180b3f51104745d263a106c62b4bec11a4 /net/ipv4/fib_semantics.c | |
| parent | 9d6ec938019c6b16cb9ec96598ebe8f20de435fe (diff) | |
| download | lwn-9ade22861f922344788321e374c542c92bc049b6.tar.gz lwn-9ade22861f922344788321e374c542c92bc049b6.zip | |
ipv4: Use flowi4 in FIB layer.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/fib_semantics.c')
| -rw-r--r-- | net/ipv4/fib_semantics.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c index a721013fdf46..622ac4c95026 100644 --- a/net/ipv4/fib_semantics.c +++ b/net/ipv4/fib_semantics.c @@ -560,16 +560,16 @@ static int fib_check_nh(struct fib_config *cfg, struct fib_info *fi, } rcu_read_lock(); { - struct flowi fl = { - .fl4_dst = nh->nh_gw, - .fl4_scope = cfg->fc_scope + 1, - .flowi_oif = nh->nh_oif, + struct flowi4 fl4 = { + .daddr = nh->nh_gw, + .flowi4_scope = cfg->fc_scope + 1, + .flowi4_oif = nh->nh_oif, }; /* It is not necessary, but requires a bit of thinking */ - if (fl.fl4_scope < RT_SCOPE_LINK) - fl.fl4_scope = RT_SCOPE_LINK; - err = fib_lookup(net, &fl.u.ip4, &res); + if (fl4.flowi4_scope < RT_SCOPE_LINK) + fl4.flowi4_scope = RT_SCOPE_LINK; + err = fib_lookup(net, &fl4, &res); if (err) { rcu_read_unlock(); return err; |