[PATCH] lockdep: print irq-trace info on asserts

[safe/jmp/linux-2.6] / include / linux / netpoll.h

diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h
index b7eb008..29930b7 100644 (file)
--- a/include/linux/netpoll.h
+++ b/include/linux/netpoll.h
@@ -12,16 +12,15 @@
 #include <linux/rcupdate.h>
 #include <linux/list.h>
 
-struct netpoll;
-
 struct netpoll {
        struct net_device *dev;
-       char dev_name[16], *name;
+       char dev_name[IFNAMSIZ];
+       const char *name;
        void (*rx_hook)(struct netpoll *, int, char *, int);
 
        u32 local_ip, remote_ip;
        u16 local_port, remote_port;
-       unsigned char local_mac[6], remote_mac[6];
+       u8 local_mac[ETH_ALEN], remote_mac[ETH_ALEN];
 };
 
 struct netpoll_info {
@@ -33,7 +32,7 @@ struct netpoll_info {
        struct netpoll *rx_np; /* netpoll that registered an rx_hook */
        struct sk_buff_head arp_tx; /* list of arp requests to reply to */
        struct sk_buff_head txq;
-       struct work_struct tx_work;
+       struct delayed_work tx_work;
 };
 
 void netpoll_poll(struct netpoll *np);