[Linux-mips-commits]CVS: linux/include/linux netdevice.h,1.3,1.4

[Paul M. <le...@us...>]

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

Modified Files:
	netdevice.h 
Log Message:
Synced with Ralf's 2.4.8 code.



Index: netdevice.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/linux/netdevice.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** netdevice.h	2001/08/25 02:19:28	1.3
--- netdevice.h	2001/08/25 06:24:46	1.4
***************
*** 304,308 ****
  	/* Interface address info. */
  	unsigned char		broadcast[MAX_ADDR_LEN];	/* hw bcast add	*/
- 	unsigned char		pad;		/* make dev_addr aligned to 8 bytes */
  	unsigned char		dev_addr[MAX_ADDR_LEN];	/* hw address	*/
  	unsigned char		addr_len;	/* hardware address length	*/
--- 304,307 ----
***************
*** 568,571 ****
--- 567,581 ----
  
  extern int		netdev_nit;
+ 
+ /* Post buffer to the network code from _non interrupt_ context.
+  * see net/core/dev.c for netif_rx description.
+  */
+ static inline int netif_rx_ni(struct sk_buff *skb)
+ {
+        int err = netif_rx(skb);
+        if (softirq_pending(smp_processor_id()))
+                do_softirq();
+        return err;
+ }
  
  static inline void dev_init_buffers(struct net_device *dev)