diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 06:35:23 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 06:37:32 -0400 |
commit | 365d46dc9be9b3c833990a06f3994b1987eda578 (patch) | |
tree | 9397d1304144a288411f2118707f44ff5e862fa6 /include/net/route.h | |
parent | 5dc64a3442b98eaa0e3730c35fcf00cf962a93e7 (diff) | |
parent | fd048088306656824958e7783ffcee27e241b361 (diff) |
Merge branch 'linus' into x86/xen
Conflicts:
arch/x86/kernel/cpu/common.c
arch/x86/kernel/process_64.c
arch/x86/xen/enlighten.c
Diffstat (limited to 'include/net/route.h')
-rw-r--r-- | include/net/route.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/include/net/route.h b/include/net/route.h index 4f0d8c14736c..4e8cae0e5841 100644 --- a/include/net/route.h +++ b/include/net/route.h | |||
@@ -27,7 +27,7 @@ | |||
27 | #include <net/dst.h> | 27 | #include <net/dst.h> |
28 | #include <net/inetpeer.h> | 28 | #include <net/inetpeer.h> |
29 | #include <net/flow.h> | 29 | #include <net/flow.h> |
30 | #include <net/sock.h> | 30 | #include <net/inet_sock.h> |
31 | #include <linux/in_route.h> | 31 | #include <linux/in_route.h> |
32 | #include <linux/rtnetlink.h> | 32 | #include <linux/rtnetlink.h> |
33 | #include <linux/route.h> | 33 | #include <linux/route.h> |
@@ -161,6 +161,10 @@ static inline int ip_route_connect(struct rtable **rp, __be32 dst, | |||
161 | 161 | ||
162 | int err; | 162 | int err; |
163 | struct net *net = sock_net(sk); | 163 | struct net *net = sock_net(sk); |
164 | |||
165 | if (inet_sk(sk)->transparent) | ||
166 | fl.flags |= FLOWI_FLAG_ANYSRC; | ||
167 | |||
164 | if (!dst || !src) { | 168 | if (!dst || !src) { |
165 | err = __ip_route_output_key(net, rp, &fl); | 169 | err = __ip_route_output_key(net, rp, &fl); |
166 | if (err) | 170 | if (err) |
@@ -204,4 +208,9 @@ static inline struct inet_peer *rt_get_peer(struct rtable *rt) | |||
204 | return rt->peer; | 208 | return rt->peer; |
205 | } | 209 | } |
206 | 210 | ||
211 | static inline int inet_iif(const struct sk_buff *skb) | ||
212 | { | ||
213 | return skb->rtable->rt_iif; | ||
214 | } | ||
215 | |||
207 | #endif /* _ROUTE_H */ | 216 | #endif /* _ROUTE_H */ |