git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sctp: Clean up TEST_FRAME hacks.
[safe/jmp/linux-2.6]
/
include
/
net
/
route.h
diff --git
a/include/net/route.h
b/include/net/route.h
index
3140cc5
..
4e8cae0
100644
(file)
--- a/
include/net/route.h
+++ b/
include/net/route.h
@@
-27,7
+27,7
@@
#include <net/dst.h>
#include <net/inetpeer.h>
#include <net/flow.h>
#include <net/dst.h>
#include <net/inetpeer.h>
#include <net/flow.h>
-#include <net/sock.h>
+#include <net/
inet_
sock.h>
#include <linux/in_route.h>
#include <linux/rtnetlink.h>
#include <linux/route.h>
#include <linux/in_route.h>
#include <linux/rtnetlink.h>
#include <linux/route.h>
@@
-161,6
+161,10
@@
static inline int ip_route_connect(struct rtable **rp, __be32 dst,
int err;
struct net *net = sock_net(sk);
int err;
struct net *net = sock_net(sk);
+
+ if (inet_sk(sk)->transparent)
+ fl.flags |= FLOWI_FLAG_ANYSRC;
+
if (!dst || !src) {
err = __ip_route_output_key(net, rp, &fl);
if (err)
if (!dst || !src) {
err = __ip_route_output_key(net, rp, &fl);
if (err)
@@
-204,6
+208,9
@@
static inline struct inet_peer *rt_get_peer(struct rtable *rt)
return rt->peer;
}
return rt->peer;
}
-extern ctl_table ipv4_route_table[];
+static inline int inet_iif(const struct sk_buff *skb)
+{
+ return skb->rtable->rt_iif;
+}
#endif /* _ROUTE_H */
#endif /* _ROUTE_H */