diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-25 22:39:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-25 22:39:45 -0800 |
| commit | c01debcd72ff37dbd87de54d5f0a1d753092775f (patch) | |
| tree | a14e17c2e368eaae70ce21d0d3c88d419b1183d4 /include/linux/netpoll.h | |
| parent | d506d2b66af72403912db434453c5e5a31c0b2d3 (diff) | |
| parent | 651b6a34392167cd0310869cbc0341f91ba4d956 (diff) | |
Merge bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux/netpoll.h')
| -rw-r--r-- | include/linux/netpoll.h | 35 |
1 files changed, 33 insertions, 2 deletions
diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h index ccf1ccb80972..c0d8b90c5202 100644 --- a/include/linux/netpoll.h +++ b/include/linux/netpoll.h @@ -16,11 +16,14 @@ struct netpoll; struct netpoll { struct net_device *dev; char dev_name[16], *name; + int rx_flags; void (*rx_hook)(struct netpoll *, int, char *, int); + void (*drop)(struct sk_buff *skb); u32 local_ip, remote_ip; u16 local_port, remote_port; unsigned char local_mac[6], remote_mac[6]; - struct list_head rx_list; + spinlock_t poll_lock; + int poll_owner; }; void netpoll_poll(struct netpoll *np); @@ -30,7 +33,35 @@ 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); +int __netpoll_rx(struct sk_buff *skb); +void netpoll_queue(struct sk_buff *skb); +#ifdef CONFIG_NETPOLL +static inline int netpoll_rx(struct sk_buff *skb) +{ + return skb->dev->np && skb->dev->np->rx_flags && __netpoll_rx(skb); +} + +static inline void netpoll_poll_lock(struct net_device *dev) +{ + if (dev->np) { + spin_lock(&dev->np->poll_lock); + dev->np->poll_owner = smp_processor_id(); + } +} + +static inline void netpoll_poll_unlock(struct net_device *dev) +{ + if (dev->np) { + spin_unlock(&dev->np->poll_lock); + dev->np->poll_owner = -1; + } +} + +#else +#define netpoll_rx(a) 0 +#define netpoll_poll_lock(a) +#define netpoll_poll_unlock(a) +#endif #endif |