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 18:08:49 -0500 |
commit | 9ade22861f922344788321e374c542c92bc049b6 (patch) | |
tree | c0bc23180b3f51104745d263a106c62b4bec11a4 /net/ipv4/fib_semantics.c | |
parent | 9d6ec938019c6b16cb9ec96598ebe8f20de435fe (diff) |
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, | |||
560 | } | 560 | } |
561 | rcu_read_lock(); | 561 | rcu_read_lock(); |
562 | { | 562 | { |
563 | struct flowi fl = { | 563 | struct flowi4 fl4 = { |
564 | .fl4_dst = nh->nh_gw, | 564 | .daddr = nh->nh_gw, |
565 | .fl4_scope = cfg->fc_scope + 1, | 565 | .flowi4_scope = cfg->fc_scope + 1, |
566 | .flowi_oif = nh->nh_oif, | 566 | .flowi4_oif = nh->nh_oif, |
567 | }; | 567 | }; |
568 | 568 | ||
569 | /* It is not necessary, but requires a bit of thinking */ | 569 | /* It is not necessary, but requires a bit of thinking */ |
570 | if (fl.fl4_scope < RT_SCOPE_LINK) | 570 | if (fl4.flowi4_scope < RT_SCOPE_LINK) |
571 | fl.fl4_scope = RT_SCOPE_LINK; | 571 | fl4.flowi4_scope = RT_SCOPE_LINK; |
572 | err = fib_lookup(net, &fl.u.ip4, &res); | 572 | err = fib_lookup(net, &fl4, &res); |
573 | if (err) { | 573 | if (err) { |
574 | rcu_read_unlock(); | 574 | rcu_read_unlock(); |
575 | return err; | 575 | return err; |