* [PATCH net-next] sctp: Clean up TEST_FRAME hacks.
@ 2009-03-19 21:43 Vlad Yasevich
2009-03-21 20:41 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Vlad Yasevich @ 2009-03-19 21:43 UTC (permalink / raw)
To: netdev; +Cc: David Miller, linux-sctp
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>
---
include/net/sctp/sctp.h | 7 -------
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 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>
--
1.5.4.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] sctp: Clean up TEST_FRAME hacks.
2009-03-19 21:43 [PATCH net-next] sctp: Clean up TEST_FRAME hacks Vlad Yasevich
@ 2009-03-21 20:41 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2009-03-21 20:41 UTC (permalink / raw)
To: vladislav.yasevich; +Cc: netdev, linux-sctp
From: Vlad Yasevich <vladislav.yasevich@hp.com>
Date: Thu, 19 Mar 2009 17:43:03 -0400
> 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>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-03-21 20:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-03-19 21:43 [PATCH net-next] sctp: Clean up TEST_FRAME hacks Vlad Yasevich
2009-03-21 20:41 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).