diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-02-18 09:03:57 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-02-18 09:03:57 +0100 |
| commit | 061f817eb6a6f97a7e34b73e5e80baa3a20b7663 (patch) | |
| tree | 412332269985de14d5e1ae9eedbfcd73bc635e97 /include/net/ip6_route.h | |
| parent | x86/mce/AMD: Set MCAX Enable bit (diff) | |
| parent | Linux 4.5-rc4 (diff) | |
| download | linux-061f817eb6a6f97a7e34b73e5e80baa3a20b7663.tar.xz linux-061f817eb6a6f97a7e34b73e5e80baa3a20b7663.zip | |
Merge tag 'v4.5-rc4' into ras/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/net/ip6_route.h')
| -rw-r--r-- | include/net/ip6_route.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index 877f682989b8..295d291269e2 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h @@ -64,8 +64,16 @@ static inline bool rt6_need_strict(const struct in6_addr *daddr) void ip6_route_input(struct sk_buff *skb); -struct dst_entry *ip6_route_output(struct net *net, const struct sock *sk, - struct flowi6 *fl6); +struct dst_entry *ip6_route_output_flags(struct net *net, const struct sock *sk, + struct flowi6 *fl6, int flags); + +static inline struct dst_entry *ip6_route_output(struct net *net, + const struct sock *sk, + struct flowi6 *fl6) +{ + return ip6_route_output_flags(net, sk, fl6, 0); +} + struct dst_entry *ip6_route_lookup(struct net *net, struct flowi6 *fl6, int flags); |