Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[wrt350n-kernel.git] / include / linux / netpoll.h
blob89d31c1f7a1a754fb4ddfb2610282ad1b73a65c7
1 /*
2 * Common code for low-level network console, dump, and debugger code
4 * Derived from netconsole, kgdb-over-ethernet, and netdump patches
5 */
7 #ifndef _LINUX_NETPOLL_H
8 #define _LINUX_NETPOLL_H
10 #include <linux/netdevice.h>
11 #include <linux/interrupt.h>
12 #include <linux/rcupdate.h>
13 #include <linux/list.h>
15 struct netpoll {
16 struct net_device *dev;
17 char dev_name[IFNAMSIZ];
18 const char *name;
19 void (*rx_hook)(struct netpoll *, int, char *, int);
21 u32 local_ip, remote_ip;
22 u16 local_port, remote_port;
23 u8 remote_mac[ETH_ALEN];
26 struct netpoll_info {
27 atomic_t refcnt;
28 <<<<<<< HEAD:include/linux/netpoll.h
29 =======
30 int rx_flags;
31 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:include/linux/netpoll.h
32 spinlock_t rx_lock;
33 struct netpoll *rx_np; /* netpoll that registered an rx_hook */
34 struct sk_buff_head arp_tx; /* list of arp requests to reply to */
35 struct sk_buff_head txq;
36 struct delayed_work tx_work;
39 void netpoll_poll(struct netpoll *np);
40 void netpoll_send_udp(struct netpoll *np, const char *msg, int len);
41 void netpoll_print_options(struct netpoll *np);
42 int netpoll_parse_options(struct netpoll *np, char *opt);
43 int netpoll_setup(struct netpoll *np);
44 int netpoll_trap(void);
45 void netpoll_set_trap(int trap);
46 void netpoll_cleanup(struct netpoll *np);
47 int __netpoll_rx(struct sk_buff *skb);
50 #ifdef CONFIG_NETPOLL
51 static inline int netpoll_rx(struct sk_buff *skb)
53 struct netpoll_info *npinfo = skb->dev->npinfo;
54 unsigned long flags;
55 int ret = 0;
57 <<<<<<< HEAD:include/linux/netpoll.h
58 if (!npinfo || !npinfo->rx_np)
59 =======
60 if (!npinfo || (!npinfo->rx_np && !npinfo->rx_flags))
61 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:include/linux/netpoll.h
62 return 0;
64 spin_lock_irqsave(&npinfo->rx_lock, flags);
65 <<<<<<< HEAD:include/linux/netpoll.h
66 /* check rx_np again with the lock held */
67 if (npinfo->rx_np && __netpoll_rx(skb))
68 =======
69 /* check rx_flags again with the lock held */
70 if (npinfo->rx_flags && __netpoll_rx(skb))
71 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:include/linux/netpoll.h
72 ret = 1;
73 spin_unlock_irqrestore(&npinfo->rx_lock, flags);
75 return ret;
78 static inline int netpoll_receive_skb(struct sk_buff *skb)
80 if (!list_empty(&skb->dev->napi_list))
81 return netpoll_rx(skb);
82 return 0;
85 static inline void *netpoll_poll_lock(struct napi_struct *napi)
87 struct net_device *dev = napi->dev;
89 rcu_read_lock(); /* deal with race on ->npinfo */
90 if (dev && dev->npinfo) {
91 spin_lock(&napi->poll_lock);
92 napi->poll_owner = smp_processor_id();
93 return napi;
95 return NULL;
98 static inline void netpoll_poll_unlock(void *have)
100 struct napi_struct *napi = have;
102 if (napi) {
103 napi->poll_owner = -1;
104 spin_unlock(&napi->poll_lock);
106 rcu_read_unlock();
109 static inline void netpoll_netdev_init(struct net_device *dev)
111 INIT_LIST_HEAD(&dev->napi_list);
114 #else
115 static inline int netpoll_rx(struct sk_buff *skb)
117 return 0;
119 static inline int netpoll_receive_skb(struct sk_buff *skb)
121 return 0;
123 static inline void *netpoll_poll_lock(struct napi_struct *napi)
125 return NULL;
127 static inline void netpoll_poll_unlock(void *have)
130 static inline void netpoll_netdev_init(struct net_device *dev)
133 #endif
135 #endif