diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-01-30 15:08:27 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-01-30 15:08:27 +0100 |
| commit | 7e86548e2cc8d308cb75439480f428137151b0de (patch) | |
| tree | fa3bcdedb64f4642a21080bc2b4ddc69ce2b2285 /include/net/ip6_route.h | |
| parent | x86/speculation: Simplify indirect_branch_prediction_barrier() (diff) | |
| parent | Linux 4.15 (diff) | |
| download | linux-7e86548e2cc8d308cb75439480f428137151b0de.tar.xz linux-7e86548e2cc8d308cb75439480f428137151b0de.zip | |
Merge tag 'v4.15' into x86/pti, to be able to merge dependent changes
Time has come to switch PTI development over to a v4.15 base - we'll still
try to make sure that all PTI fixes backport cleanly to v4.14 and earlier.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/net/ip6_route.h')
| -rw-r--r-- | include/net/ip6_route.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index bee528135cf1..18e442ea93d8 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h @@ -96,6 +96,11 @@ int ip6_route_add(struct fib6_config *cfg, struct netlink_ext_ack *extack); int ip6_ins_rt(struct rt6_info *); int ip6_del_rt(struct rt6_info *); +void rt6_flush_exceptions(struct rt6_info *rt); +int rt6_remove_exception_rt(struct rt6_info *rt); +void rt6_age_exceptions(struct rt6_info *rt, struct fib6_gc_args *gc_args, + unsigned long now); + static inline int ip6_route_get_saddr(struct net *net, struct rt6_info *rt, const struct in6_addr *daddr, unsigned int prefs, |