This patch cleans up the net/* subtree
--- linux-2.5.68-bk3/net/core/dev.c.dist 2003-04-22 13:57:17.000000000 -0400
+++ linux-2.5.68-bk3/net/core/dev.c 2003-04-22 14:48:28.133679979 -0400
@@ -1365,7 +1365,7 @@
if (skb_is_nonlinear(skb) && skb_linearize(skb, GFP_ATOMIC))
goto out_kfree;
-#if CONFIG_SMP
+#ifdef CONFIG_SMP
/* Old protocols did not depened on BHs different of NET_BH and
TIMER_BH - they need to be fixed for the new assumptions.
*/
--- linux-2.5.68-bk3/net/irda/irlap.c.dist 2003-04-07 13:32:50.000000000 -0400
+++ linux-2.5.68-bk3/net/irda/irlap.c 2003-04-22 14:49:16.615699947 -0400
@@ -1117,7 +1117,7 @@
len += sprintf(buf+len, " win size: %d, ",
self->window_size);
len += sprintf(buf+len, "win: %d, ", self->window);
-#if CONFIG_IRDA_DYNAMIC_WINDOW
+#ifdef CONFIG_IRDA_DYNAMIC_WINDOW
len += sprintf(buf+len, "line capacity: %d, ",
self->line_capacity);
len += sprintf(buf+len, "bytes left: %d\n", self->bytes_left);
--- linux-2.5.68-bk3/net/irda/irlap_event.c.dist 2003-04-22 13:57:17.000000000 -0400
+++ linux-2.5.68-bk3/net/irda/irlap_event.c 2003-04-22 14:48:58.325346802 -0400
@@ -43,7 +43,7 @@
#include <net/irda/irda_device.h>
-#if CONFIG_IRDA_FAST_RR
+#ifdef CONFIG_IRDA_FAST_RR
int sysctl_fast_poll_increase = 50;
#endif
--- linux-2.5.68-bk3/net/sctp/socket.c.dist 2003-04-07 13:33:03.000000000 -0400
+++ linux-2.5.68-bk3/net/sctp/socket.c 2003-04-22 14:49:44.559065634 -0400
@@ -446,7 +446,7 @@
* --daisy
*/
-#if CONFIG_IP_SCTP_ADDIP
+#ifdef CONFIG_IP_SCTP_ADDIP
/* Add these addresses to all associations on this endpoint. */
if (retval >= 0) {
struct list_head *pos;
@@ -566,7 +566,7 @@
* ADDIP code.
* --daisy
*/
-#if CONFIG_IP_SCTP_ADDIP
+#ifdef CONFIG_IP_SCTP_ADDIP
/* Remove these addresses from all associations on this endpoint. */
if (retval >= 0) {
struct list_head *pos;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Wed Apr 23 2003 - 22:00:34 EST