From 71fb00d7e4983779cb255517ef89e990aea7f1f0 Mon Sep 17 00:00:00 2001
From: Vlad Yasevich <vladislav.yasevich@hp.com>
Date: Sat, 21 Mar 2009 13:41:09 -0700
Subject: [PATCH] --- yaml --- r: 135355 b: refs/heads/master c:
 8d2f9e81169b8120cf2b4872930ae491b17c27b8 h: refs/heads/master i:   135353:
 322a114fe0b29b063c6577e4a946680efc30bab0   135351:
 33c7d2037d4ced1bf43543a775f790b2851f8823 v: v3

---
 [refs]                        | 2 +-
 trunk/include/net/sctp/sctp.h | 7 -------
 trunk/net/sctp/output.c       | 5 +----
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 38e3750ea2ba..f9b5026f5152 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 09a3b1f8b1af7220fd7a3caf18e6841a7f5a6c6e
+refs/heads/master: 8d2f9e81169b8120cf2b4872930ae491b17c27b8
diff --git a/trunk/include/net/sctp/sctp.h b/trunk/include/net/sctp/sctp.h
index 9e226be3be69..9f80a7668289 100644
--- a/trunk/include/net/sctp/sctp.h
+++ b/trunk/include/net/sctp/sctp.h
@@ -62,13 +62,6 @@
  *   and will continue to evolve.
  */
 
-
-
-#ifdef TEST_FRAME
-#undef CONFIG_SCTP_DBG_OBJCNT
-#undef CONFIG_SYSCTL
-#endif /* TEST_FRAME */
-
 #include <linux/types.h>
 #include <linux/slab.h>
 #include <linux/in.h>
diff --git a/trunk/net/sctp/output.c b/trunk/net/sctp/output.c
index 07d58903a746..7d08f522ec84 100644
--- a/trunk/net/sctp/output.c
+++ b/trunk/net/sctp/output.c
@@ -49,13 +49,10 @@
 #include <linux/ipv6.h>
 #include <linux/init.h>
 #include <net/inet_ecn.h>
+#include <net/ip.h>
 #include <net/icmp.h>
 #include <net/net_namespace.h>
 
-#ifndef TEST_FRAME
-#include <net/tcp.h>
-#endif /* TEST_FRAME (not defined) */
-
 #include <linux/socket.h> /* for sa_family_t */
 #include <net/sock.h>