netpoll: prepare for ipv6

[deliverable/linux.git] / include / linux / netpoll.h

diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h
index 66d5379c305e60d17dcde8b60d286f0b57b23a16..f54c3bb6a22b52b05da086e3033d368e0cb9e494 100644 (file)
--- a/include/linux/netpoll.h
+++ b/include/linux/netpoll.h
@@ -12,13 +12,22 @@
 #include <linux/rcupdate.h>
 #include <linux/list.h>
 
+union inet_addr {
+       __u32           all[4];
+       __be32          ip;
+       __be32          ip6[4];
+       struct in_addr  in;
+       struct in6_addr in6;
+};
+
 struct netpoll {
        struct net_device *dev;
        char dev_name[IFNAMSIZ];
        const char *name;
        void (*rx_hook)(struct netpoll *, int, char *, int);
 
-       __be32 local_ip, remote_ip;
+       union inet_addr local_ip, remote_ip;
+       bool ipv6;
        u16 local_port, remote_port;
        u8 remote_mac[ETH_ALEN];
 
@@ -33,7 +42,7 @@ struct netpoll_info {
        spinlock_t rx_lock;
        struct list_head rx_np; /* netpolls that registered an rx_hook */
 
-       struct sk_buff_head arp_tx; /* list of arp requests to reply to */
+       struct sk_buff_head neigh_tx; /* list of neigh requests to reply to */
        struct sk_buff_head txq;
 
        struct delayed_work tx_work;