diff options
-rw-r--r-- | include/net/sctp/sctp.h | 7 | ||||
-rw-r--r-- | net/sctp/output.c | 5 |
2 files changed, 1 insertions, 11 deletions
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h index 9e226be3be69..9f80a7668289 100644 --- a/include/net/sctp/sctp.h +++ b/include/net/sctp/sctp.h | |||
@@ -62,13 +62,6 @@ | |||
62 | * and will continue to evolve. | 62 | * and will continue to evolve. |
63 | */ | 63 | */ |
64 | 64 | ||
65 | |||
66 | |||
67 | #ifdef TEST_FRAME | ||
68 | #undef CONFIG_SCTP_DBG_OBJCNT | ||
69 | #undef CONFIG_SYSCTL | ||
70 | #endif /* TEST_FRAME */ | ||
71 | |||
72 | #include <linux/types.h> | 65 | #include <linux/types.h> |
73 | #include <linux/slab.h> | 66 | #include <linux/slab.h> |
74 | #include <linux/in.h> | 67 | #include <linux/in.h> |
diff --git a/net/sctp/output.c b/net/sctp/output.c index 07d58903a746..7d08f522ec84 100644 --- a/net/sctp/output.c +++ b/net/sctp/output.c | |||
@@ -49,13 +49,10 @@ | |||
49 | #include <linux/ipv6.h> | 49 | #include <linux/ipv6.h> |
50 | #include <linux/init.h> | 50 | #include <linux/init.h> |
51 | #include <net/inet_ecn.h> | 51 | #include <net/inet_ecn.h> |
52 | #include <net/ip.h> | ||
52 | #include <net/icmp.h> | 53 | #include <net/icmp.h> |
53 | #include <net/net_namespace.h> | 54 | #include <net/net_namespace.h> |
54 | 55 | ||
55 | #ifndef TEST_FRAME | ||
56 | #include <net/tcp.h> | ||
57 | #endif /* TEST_FRAME (not defined) */ | ||
58 | |||
59 | #include <linux/socket.h> /* for sa_family_t */ | 56 | #include <linux/socket.h> /* for sa_family_t */ |
60 | #include <net/sock.h> | 57 | #include <net/sock.h> |
61 | 58 | ||