From bcb056d461b280f8c463bf5de96605442f639d85 Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@mandriva.com>
Date: Wed, 4 Jan 2006 01:58:06 -0200
Subject: [PATCH] --- yaml --- r: 15591 b: refs/heads/master c:
 80e40daa4797a156781d1594642b654eb1c461df h: refs/heads/master i:   15589:
 d17ed913fd977f6894264b1ba64c3c66dfafc031   15587:
 ead1a3a14aa0199f94147ed5c3496b8db356be18   15583:
 3cb67985967eb2b00a09a2fef4a6efc273bf0fda v: v3

---
 [refs]                    | 2 +-
 trunk/net/ipv4/tcp_ipv4.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index bf448306ef16..a909a167ab13 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4dfd449c80a41bb615b23d0fc198ba08360a1f8
+refs/heads/master: 80e40daa4797a156781d1594642b654eb1c461df
diff --git a/trunk/net/ipv4/tcp_ipv4.c b/trunk/net/ipv4/tcp_ipv4.c
index 5c70493dff02..e9f83e5b28ce 100644
--- a/trunk/net/ipv4/tcp_ipv4.c
+++ b/trunk/net/ipv4/tcp_ipv4.c
@@ -661,6 +661,7 @@ static void tcp_v4_reqsk_destructor(struct request_sock *req)
 	kfree(inet_rsk(req)->opt);
 }
 
+#ifdef CONFIG_SYN_COOKIES
 static void syn_flood_warning(struct sk_buff *skb)
 {
 	static unsigned long warntime;
@@ -672,6 +673,7 @@ static void syn_flood_warning(struct sk_buff *skb)
 		       ntohs(skb->h.th->dest));
 	}
 }
+#endif
 
 /*
  * Save and compile IPv4 options into the request_sock if needed.