[Linux-mips-commits]CVS: linux/include/linux netdevice.h,1.7,1.8 threads.h,1.2,1.3

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/include/linux
In directory usw-pr-cvs1:/tmp/cvs-serv17983/include/linux

Modified Files:
	netdevice.h threads.h 
Log Message:
Synced to 2.4.18

Index: netdevice.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/linux/netdevice.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- netdevice.h	6 Nov 2001 09:10:22 -0000	1.7
+++ netdevice.h	26 Feb 2002 19:03:33 -0000	1.8
@@ -39,6 +39,11 @@
 #include <net/profile.h>
 #endif
 
+#ifdef CONFIG_COBALT_27
+typedef int (*linkcheck_func_t)(void *cookie);
+extern int lcd_register_linkcheck_func(int iface_num, void *func, void *cookie);
+#endif /* CONFIG_COBALT_27 */
+
 struct divert_blk;
 
 #define HAVE_ALLOC_NETDEV		/* feature macro: alloc_xxxdev
@@ -145,11 +150,6 @@
 #include <linux/cache.h>
 #include <linux/skbuff.h>
 
-#ifdef CONFIG_COBALT_27
-typedef int (*linkcheck_func_t)(void *cookie);
-extern int lcd_register_linkcheck_func(int iface_num, void *func, void *cookie);
-#endif /* CONFIG_COBALT_27 */
-
 struct neighbour;
 struct neigh_parms;
 struct sk_buff;
@@ -668,6 +668,8 @@
 	NETIF_MSG_TX_DONE	= 0x0400,
 	NETIF_MSG_RX_STATUS	= 0x0800,
 	NETIF_MSG_PKTDATA	= 0x1000,
+	NETIF_MSG_HW		= 0x2000,
+	NETIF_MSG_WOL		= 0x4000,
 };
 
 #define netif_msg_drv(p)	((p)->msg_enable & NETIF_MSG_DRV)
@@ -683,6 +685,8 @@
 #define netif_msg_tx_done(p)	((p)->msg_enable & NETIF_MSG_TX_DONE)
 #define netif_msg_rx_status(p)	((p)->msg_enable & NETIF_MSG_RX_STATUS)
 #define netif_msg_pktdata(p)	((p)->msg_enable & NETIF_MSG_PKTDATA)
+#define netif_msg_hw(p)		((p)->msg_enable & NETIF_MSG_HW)
+#define netif_msg_wol(p)	((p)->msg_enable & NETIF_MSG_WOL)
 
 /* These functions live elsewhere (drivers/net/net_init.c, but related) */
 

Index: threads.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/linux/threads.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- threads.h	19 Nov 2001 17:25:56 -0000	1.2
+++ threads.h	26 Feb 2002 19:03:33 -0000	1.3
@@ -5,7 +5,7 @@
 
 /*
  * The default limit for the nr of threads is now in
- * /proc/sys/kernel/max-threads.
+ * /proc/sys/kernel/threads-max.
  */
  
 #ifdef CONFIG_SMP