patch-2.4.8 linux/include/linux/netdevice.h

Next file: linux/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
Previous file: linux/include/linux/mount.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.7/linux/include/linux/netdevice.h linux/include/linux/netdevice.h
@@ -298,7 +298,6 @@
 
 	/* 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	*/
 
@@ -562,6 +561,17 @@
 extern void		dev_init(void);
 
 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)
 {

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)