v2.4.13.5 -> v2.4.13.6

  - me: remember to bump the version number ;)
  - Hugh Dickins: export "free_lru_page()" for modules
  - Jeff Garzik: don't change nopage arguments, just make the last a dummy one
  - David Miller: sparc and net updates (netfilter, VLAN etc)
  - Nikita Danilov: reiserfs cleanups
  - Jan Kara: quota initialization race
  - Tigran Aivazian: make the x86 microcode update driver happy about
  hyperthreaded P4's
  - me: shrink dcache/icache more aggressively
  - me: fix up oom-killer so that it actually works

5 files changed, 6 insertions, 56 deletions

diff --git a/include/net/inet_ecn.h b/include/net/inet_ecn.h
index 2ddf7675aa1c..ae82d3b32d2e 100644
--- a/include/net/inet_ecn.h
+++ b/include/net/inet_ecn.h
@@ -1,10 +1,6 @@
 #ifndef _INET_ECN_H_
 #define _INET_ECN_H_
 
-#include <linux/config.h>
-
-#ifdef CONFIG_INET_ECN
-
 static inline int INET_ECN_is_ce(__u8 dsfield)
 {
 	return (dsfield&3) == 3;
@@ -40,18 +36,6 @@ static inline __u8 INET_ECN_encapsulate(__u8 outer, __u8 inner)
 		(label) |= __constant_htons(2 << 4);		\
     } while (0)
 
-
-#else
-#define INET_ECN_is_ce(x...)		(0)
-#define INET_ECN_is_not_ce(x...)	(0)
-#define INET_ECN_is_capable(x...)	(0)
-#define INET_ECN_encapsulate(x, y)	(x)
-#define IP6_ECN_flow_init(x...)		do { } while (0)
-#define	IP6_ECN_flow_xmit(x...)		do { } while (0)
-#define	INET_ECN_xmit(x...)		do { } while (0)
-#define	INET_ECN_dontxmit(x...)		do { } while (0)
-#endif
-
 static inline void IP_ECN_set_ce(struct iphdr *iph)
 {
 	u32 check = iph->check;
diff --git a/include/net/route.h b/include/net/route.h
index f35af5807444..6ec63ffe050b 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -147,12 +147,7 @@ static inline void ip_rt_put(struct rtable * rt)
 		dst_release(&rt->u.dst);
 }
 
-#ifdef CONFIG_INET_ECN
 #define IPTOS_RT_MASK	(IPTOS_TOS_MASK & ~3)
-#else
-#define IPTOS_RT_MASK	IPTOS_TOS_MASK
-#endif
-
 
 extern __u8 ip_tos2prio[16];
 
diff --git a/include/net/sock.h b/include/net/sock.h
index 480f74267d32..bc364e73eb30 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -416,6 +416,8 @@ struct tcp_opt {
 	unsigned int		keepalive_time;	  /* time before keep alive takes place */
 	unsigned int		keepalive_intvl;  /* time interval between keep alive probes */
 	int			linger2;
+
+	unsigned long last_synq_overflow; 
 };
 
  	
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 2cd60784ada2..fd137efd84cf 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -568,9 +568,7 @@ struct tcp_func {
 							 struct sk_buff *skb,
 							 struct open_request *req,
 							 struct dst_entry *dst);
-	
-	int			(*hash_connecting)	(struct sock *sk);
-
+    
 	int			(*remember_stamp)	(struct sock *sk);
 
 	__u16			net_header_len;
@@ -772,8 +770,9 @@ extern int			tcp_v4_connect(struct sock *sk,
 					       struct sockaddr *uaddr,
 					       int addr_len);
 
-extern int			tcp_connect(struct sock *sk,
-					    struct sk_buff *skb);
+extern void			tcp_connect_init(struct sock *sk);
+
+extern void			tcp_connect_send(struct sock *sk, struct sk_buff *skb);
 
 extern struct sk_buff *		tcp_make_synack(struct sock *sk,
 						struct dst_entry *dst,
diff --git a/include/net/tcp_ecn.h b/include/net/tcp_ecn.h
index 01894cd3b587..0b9c6be48de1 100644
--- a/include/net/tcp_ecn.h
+++ b/include/net/tcp_ecn.h
@@ -1,10 +1,6 @@
 #ifndef _NET_TCP_ECN_H_
 #define _NET_TCP_ECN_H_ 1
 
-#include <linux/config.h>
-
-#ifdef CONFIG_INET_ECN
-
 #include <net/inet_ecn.h>
 
 #define TCP_HP_BITS (~(TCP_RESERVED_BITS|TCP_FLAG_PSH)|TCP_FLAG_ECE|TCP_FLAG_CWR)
@@ -133,30 +129,4 @@ TCP_ECN_create_request(struct open_request *req, struct tcphdr *th)
 		req->ecn_ok = 1;
 }
 
-
-
-#else
-
-#define TCP_HP_BITS (~(TCP_RESERVED_BITS|TCP_FLAG_PSH))
-
-
-#define TCP_ECN_send_syn(x...)		do { } while (0)
-#define TCP_ECN_send_synack(x...)	do { } while (0)
-#define TCP_ECN_make_synack(x...)	do { } while (0)
-#define TCP_ECN_send(x...)		do { } while (0)
-
-#define TCP_ECN_queue_cwr(x...)		do { } while (0)
-
-#define TCP_ECN_accept_cwr(x...)	do { } while (0)
-#define TCP_ECN_check_ce(x...)		do { } while (0)
-#define TCP_ECN_rcv_synack(x...)	do { } while (0)
-#define TCP_ECN_rcv_syn(x...)		do { } while (0)
-#define TCP_ECN_rcv_ecn_echo(x...)	(0)
-#define TCP_ECN_openreq_child(x...)	do { } while (0)
-#define TCP_ECN_create_request(x...)	do { } while (0)
-#define TCP_ECN_withdraw_cwr(x...)	do { } while (0)
-
-
-#endif
-
 #endif