Merge branch 'linus' into cont_syslog

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

diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h
index b7eb008..e9e2312 100644 (file)
--- a/include/linux/netpoll.h
+++ b/include/linux/netpoll.h
@@ -12,85 +12,128 @@
 #include <linux/rcupdate.h>
 #include <linux/list.h>
 
-struct netpoll;
-
 struct netpoll {
        struct net_device *dev;
-       char dev_name[16], *name;
+       struct net_device *real_dev;
+       char dev_name[IFNAMSIZ];
+       const char *name;
        void (*rx_hook)(struct netpoll *, int, char *, int);
 
-       u32 local_ip, remote_ip;
+       __be32 local_ip, remote_ip;
        u16 local_port, remote_port;
-       unsigned char local_mac[6], remote_mac[6];
+       u8 remote_mac[ETH_ALEN];
+
+       struct list_head rx; /* rx_np list element */
 };
 
 struct netpoll_info {
        atomic_t refcnt;
-       spinlock_t poll_lock;
-       int poll_owner;
+
        int rx_flags;
        spinlock_t rx_lock;
-       struct netpoll *rx_np; /* netpoll that registered an rx_hook */
+       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 txq;
-       struct work_struct tx_work;
+
+       struct delayed_work tx_work;
+
+       struct netpoll *netpoll;
 };
 
+void netpoll_poll_dev(struct net_device *dev);
 void netpoll_poll(struct netpoll *np);
 void netpoll_send_udp(struct netpoll *np, const char *msg, int len);
+void netpoll_print_options(struct netpoll *np);
 int netpoll_parse_options(struct netpoll *np, char *opt);
 int netpoll_setup(struct netpoll *np);
 int netpoll_trap(void);
 void netpoll_set_trap(int trap);
 void netpoll_cleanup(struct netpoll *np);
 int __netpoll_rx(struct sk_buff *skb);
+void netpoll_send_skb(struct netpoll *np, struct sk_buff *skb);
 
 
 #ifdef CONFIG_NETPOLL
-static inline int netpoll_rx(struct sk_buff *skb)
+static inline bool netpoll_rx(struct sk_buff *skb)
 {
        struct netpoll_info *npinfo = skb->dev->npinfo;
        unsigned long flags;
-       int ret = 0;
+       bool ret = false;
 
-       if (!npinfo || (!npinfo->rx_np && !npinfo->rx_flags))
-               return 0;
+       if (!npinfo || (list_empty(&npinfo->rx_np) && !npinfo->rx_flags))
+               return false;
 
        spin_lock_irqsave(&npinfo->rx_lock, flags);
        /* check rx_flags again with the lock held */
        if (npinfo->rx_flags && __netpoll_rx(skb))
-               ret = 1;
+               ret = true;
        spin_unlock_irqrestore(&npinfo->rx_lock, flags);
 
        return ret;
 }
 
-static inline void *netpoll_poll_lock(struct net_device *dev)
+static inline int netpoll_rx_on(struct sk_buff *skb)
+{
+       struct netpoll_info *npinfo = skb->dev->npinfo;
+
+       return npinfo && (!list_empty(&npinfo->rx_np) || npinfo->rx_flags);
+}
+
+static inline int netpoll_receive_skb(struct sk_buff *skb)
 {
+       if (!list_empty(&skb->dev->napi_list))
+               return netpoll_rx(skb);
+       return 0;
+}
+
+static inline void *netpoll_poll_lock(struct napi_struct *napi)
+{
+       struct net_device *dev = napi->dev;
+
        rcu_read_lock(); /* deal with race on ->npinfo */
-       if (dev->npinfo) {
-               spin_lock(&dev->npinfo->poll_lock);
-               dev->npinfo->poll_owner = smp_processor_id();
-               return dev->npinfo;
+       if (dev && dev->npinfo) {
+               spin_lock(&napi->poll_lock);
+               napi->poll_owner = smp_processor_id();
+               return napi;
        }
        return NULL;
 }
 
 static inline void netpoll_poll_unlock(void *have)
 {
-       struct netpoll_info *npi = have;
+       struct napi_struct *napi = have;
 
-       if (npi) {
-               npi->poll_owner = -1;
-               spin_unlock(&npi->poll_lock);
+       if (napi) {
+               napi->poll_owner = -1;
+               spin_unlock(&napi->poll_lock);
        }
        rcu_read_unlock();
 }
 
 #else
-#define netpoll_rx(a) 0
-#define netpoll_poll_lock(a) NULL
-#define netpoll_poll_unlock(a)
+static inline int netpoll_rx(struct sk_buff *skb)
+{
+       return 0;
+}
+static inline int netpoll_rx_on(struct sk_buff *skb)
+{
+       return 0;
+}
+static inline int netpoll_receive_skb(struct sk_buff *skb)
+{
+       return 0;
+}
+static inline void *netpoll_poll_lock(struct napi_struct *napi)
+{
+       return NULL;
+}
+static inline void netpoll_poll_unlock(void *have)
+{
+}
+static inline void netpoll_netdev_init(struct net_device *dev)
+{
+}
 #endif
 
 #endif