diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-24 18:06:47 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-24 18:06:47 -0700 |
| commit | 37e826c513883099c298317bad1b3b677b2905fb (patch) | |
| tree | a032cfe69e0cde179d86eba157cf9dc85d67df86 /include | |
| parent | 436c3b66ec9824a633724ae42de1c416af4f2063 (diff) | |
| download | linux-37e826c513883099c298317bad1b3b677b2905fb.tar.bz2 | |
ipv4: Fix nexthop caching wrt. scoping.
Move the scope value out of the fib alias entries and into fib_info,
so that we always use the correct scope when recomputing the nexthop
cached source address.
Reported-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/ip_fib.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h index cd92b923a578..e5d66ec88cf6 100644 --- a/include/net/ip_fib.h +++ b/include/net/ip_fib.h @@ -51,7 +51,6 @@ struct fib_nh { struct fib_info *nh_parent; unsigned nh_flags; unsigned char nh_scope; - unsigned char nh_cfg_scope; #ifdef CONFIG_IP_ROUTE_MULTIPATH int nh_weight; int nh_power; @@ -75,9 +74,10 @@ struct fib_info { struct net *fib_net; int fib_treeref; atomic_t fib_clntref; - int fib_dead; unsigned fib_flags; - int fib_protocol; + unsigned char fib_dead; + unsigned char fib_protocol; + unsigned char fib_scope; __be32 fib_prefsrc; u32 fib_priority; u32 *fib_metrics; |