summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVlad Yasevich <vladislav.yasevich@hp.com>2009-03-21 13:41:09 -0700
committerDavid S. Miller <davem@davemloft.net>2009-03-21 13:41:09 -0700
commit8d2f9e81169b8120cf2b4872930ae491b17c27b8 (patch)
tree851d3cbb29052ae57f11eca4e6baa2b8dfbd3d38
parent09a3b1f8b1af7220fd7a3caf18e6841a7f5a6c6e (diff)
downloadop-kernel-dev-8d2f9e81169b8120cf2b4872930ae491b17c27b8.zip
op-kernel-dev-8d2f9e81169b8120cf2b4872930ae491b17c27b8.tar.gz
sctp: Clean up TEST_FRAME hacks.
Remove 2 TEST_FRAME hacks that are no longer needed. These allowed sctp regression tests to compile before, but are no longer needed. Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/sctp/sctp.h7
-rw-r--r--net/sctp/output.c5
2 files changed, 1 insertions, 11 deletions
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index 9e226be..9f80a76 100644
--- a/include/net/sctp/sctp.h
+++ b/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/net/sctp/output.c b/net/sctp/output.c
index 07d5890..7d08f52 100644
--- a/net/sctp/output.c
+++ b/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>
OpenPOWER on IntegriCloud