---

yaml --- r: 135355 b: refs/heads/master c: 8d2f9e8 h: refs/heads/master i: 135353: 322a114 135351: 33c7d20 v: v3
git-mirror · Mar 21, 2009 · 71fb00d · 71fb00d
1 parent aade424
commit 71fb00d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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>