summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-06-27 17:05:06 -0700
committerDavid S. Miller <davem@davemloft.net>2012-06-27 17:05:06 -0700
commitc10237e077cef50e925f052e49f3b4fead9d71f9 (patch)
tree5b7418f3a31165ea2e7d119782cad0745cd45792 /include/net
parente440cf2ca0a1b075c64016240d46c3aa9d877bbf (diff)
downloadlinux-c10237e077cef50e925f052e49f3b4fead9d71f9.tar.gz
linux-c10237e077cef50e925f052e49f3b4fead9d71f9.tar.bz2
linux-c10237e077cef50e925f052e49f3b4fead9d71f9.zip
Revert "ipv4: tcp: dont cache unconfirmed intput dst"
This reverts commit c074da2810c118b3812f32d6754bd9ead2f169e7. This change has several unwanted side effects: 1) Sockets will cache the DST_NOCACHE route in sk->sk_rx_dst and we'll thus never create a real cached route. 2) All TCP traffic will use DST_NOCACHE and never use the routing cache at all. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/protocol.h2
-rw-r--r--include/net/route.h8
-rw-r--r--include/net/tcp.h2
3 files changed, 6 insertions, 6 deletions
diff --git a/include/net/protocol.h b/include/net/protocol.h
index 7cfc8f76914d..967b926cbfb1 100644
--- a/include/net/protocol.h
+++ b/include/net/protocol.h
@@ -37,7 +37,7 @@
/* This is used to register protocols. */
struct net_protocol {
- int (*early_demux)(struct sk_buff *skb, bool *nocache);
+ int (*early_demux)(struct sk_buff *skb);
int (*handler)(struct sk_buff *skb);
void (*err_handler)(struct sk_buff *skb, u32 info);
int (*gso_send_check)(struct sk_buff *skb);
diff --git a/include/net/route.h b/include/net/route.h
index 6361f9335774..47eb25ac1f7f 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -201,18 +201,18 @@ static inline struct rtable *ip_route_output_gre(struct net *net, struct flowi4
}
extern int ip_route_input_common(struct sk_buff *skb, __be32 dst, __be32 src,
- u8 tos, struct net_device *devin, bool noref, bool nocache);
+ u8 tos, struct net_device *devin, bool noref);
static inline int ip_route_input(struct sk_buff *skb, __be32 dst, __be32 src,
u8 tos, struct net_device *devin)
{
- return ip_route_input_common(skb, dst, src, tos, devin, false, false);
+ return ip_route_input_common(skb, dst, src, tos, devin, false);
}
static inline int ip_route_input_noref(struct sk_buff *skb, __be32 dst, __be32 src,
- u8 tos, struct net_device *devin, bool nocache)
+ u8 tos, struct net_device *devin)
{
- return ip_route_input_common(skb, dst, src, tos, devin, true, nocache);
+ return ip_route_input_common(skb, dst, src, tos, devin, true);
}
extern void ipv4_update_pmtu(struct sk_buff *skb, struct net *net, u32 mtu,
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 917ed2e55e8c..6660ffc4963d 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -325,7 +325,7 @@ extern void tcp_v4_err(struct sk_buff *skb, u32);
extern void tcp_shutdown (struct sock *sk, int how);
-extern int tcp_v4_early_demux(struct sk_buff *skb, bool *nocache);
+extern int tcp_v4_early_demux(struct sk_buff *skb);
extern int tcp_v4_rcv(struct sk_buff *skb);
extern struct inet_peer *tcp_v4_get_peer(struct sock *sk);