diff options
| author | David S. Miller <davem@davemloft.net> | 2012-06-16 01:23:04 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-16 01:23:04 -0700 |
| commit | aee289baaa02dd2ffa1189c1600d5572a10e0714 (patch) | |
| tree | f9fa3cb33ead21400dbda2b19287f6f06754fcb6 /include/net/ip6_fib.h | |
| parent | 42ae66c80d94645e8f74080c7f344596d6f19cd5 (diff) | |
| parent | e8803b6c387129059e04d9e14d49efda250a7361 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/ipv6/route.c
Pull in 'net' again to get the revert of Thomas's change
which introduced regressions.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/ip6_fib.h')
| -rw-r--r-- | include/net/ip6_fib.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h index 7fdbad522543..a192f7807659 100644 --- a/include/net/ip6_fib.h +++ b/include/net/ip6_fib.h @@ -302,8 +302,6 @@ extern void fib6_run_gc(unsigned long expires, extern void fib6_gc_cleanup(void); extern int fib6_init(void); -extern int fib6_init_late(void); -extern void fib6_cleanup_late(void); #ifdef CONFIG_IPV6_MULTIPLE_TABLES extern int fib6_rules_init(void); |