]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
sctp: Clean up TEST_FRAME hacks.
authorVlad Yasevich <vladislav.yasevich@hp.com>
Sat, 21 Mar 2009 20:41:09 +0000 (13:41 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 21 Mar 2009 20:41:09 +0000 (13:41 -0700)
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>
include/net/sctp/sctp.h
net/sctp/output.c

index 9e226be3be69d45c25a2cc83a86033645ff537c4..9f80a766828923a8b41ad0588d91b40fcf12a8be 100644 (file)
  *   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>
index 07d58903a74625dd2ec25982a617a6cad2d59ae3..7d08f522ec844ea73f9e69dc4a7061d4f6885de3 100644 (file)
 #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>