diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-01 14:22:55 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-01 14:26:56 +1100 |
| commit | c1ea68f0237fc3e8ea5a6c084af9bda6b9a3722c (patch) | |
| tree | 18f1c1a9ec816260ae4576496fa0b40559fb7dfd /include/net/netns/ipv4.h | |
| parent | 9a6cf71fa371180543df9f196e93986e37582c81 (diff) | |
| parent | 25f13048bce61f33f6a102e0bf377fd3922ed364 (diff) | |
Merge commit 'net/master'
Conflicts:
drivers/net/ixgbe/ixgbe_main.c
drivers/net/smc91x.c
Diffstat (limited to 'include/net/netns/ipv4.h')
| -rw-r--r-- | include/net/netns/ipv4.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h index ece1c926b5d1..977f482d97a9 100644 --- a/include/net/netns/ipv4.h +++ b/include/net/netns/ipv4.h @@ -49,6 +49,8 @@ struct netns_ipv4 { int sysctl_icmp_ratelimit; int sysctl_icmp_ratemask; int sysctl_icmp_errors_use_inbound_ifaddr; + int sysctl_rt_cache_rebuild_count; + int current_rt_cache_rebuild_count; struct timer_list rt_secret_timer; atomic_t rt_genid; |