ALSA: sound/usb: add preliminary support for UAC2 interrupts

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

diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h
index 08dcc39..a765ea8 100644 (file)
--- a/include/linux/netpoll.h
+++ b/include/linux/netpoll.h
@@ -18,23 +18,29 @@ struct netpoll {
        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;
-       u8 local_mac[ETH_ALEN], remote_mac[ETH_ALEN];
+       u8 remote_mac[ETH_ALEN];
+
+       struct list_head rx; /* rx_np list element */
 };
 
 struct netpoll_info {
        atomic_t refcnt;
+
        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 delayed_work tx_work;
 };
 
 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);
@@ -50,7 +56,7 @@ static inline int netpoll_rx(struct sk_buff *skb)
        unsigned long flags;
        int ret = 0;
 
-       if (!npinfo || (!npinfo->rx_np && !npinfo->rx_flags))
+       if (!npinfo || (list_empty(&npinfo->rx_np) && !npinfo->rx_flags))
                return 0;
 
        spin_lock_irqsave(&npinfo->rx_lock, flags);
@@ -62,6 +68,13 @@ static inline int netpoll_rx(struct sk_buff *skb)
        return ret;
 }
 
+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))
@@ -93,16 +106,15 @@ static inline void netpoll_poll_unlock(void *have)
        rcu_read_unlock();
 }
 
-static inline void netpoll_netdev_init(struct net_device *dev)
-{
-       INIT_LIST_HEAD(&dev->napi_list);
-}
-
 #else
 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;