diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-15 01:30:17 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-15 01:30:17 -0400 |
| commit | 925068dcdc746236264d1877d3d5df656e87882a (patch) | |
| tree | dc7615e1e87a1ca26ee31510c240a1c85fb6f1ad /include/linux | |
| parent | 83aa2e964b9b04effa304aaf3c1090b46812a04b (diff) | |
| parent | 67fbbe1551b24d1bcab8478407f9b8c713d5596e (diff) | |
Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netdevice.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 203c5504fe43..b54ec16dfbda 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
| @@ -828,6 +828,19 @@ static inline void netif_napi_add(struct net_device *dev, | |||
| 828 | set_bit(NAPI_STATE_SCHED, &napi->state); | 828 | set_bit(NAPI_STATE_SCHED, &napi->state); |
| 829 | } | 829 | } |
| 830 | 830 | ||
| 831 | /** | ||
| 832 | * netif_napi_del - remove a napi context | ||
| 833 | * @napi: napi context | ||
| 834 | * | ||
| 835 | * netif_napi_del() removes a napi context from the network device napi list | ||
| 836 | */ | ||
| 837 | static inline void netif_napi_del(struct napi_struct *napi) | ||
| 838 | { | ||
| 839 | #ifdef CONFIG_NETPOLL | ||
| 840 | list_del(&napi->dev_list); | ||
| 841 | #endif | ||
| 842 | } | ||
| 843 | |||
| 831 | struct packet_type { | 844 | struct packet_type { |
| 832 | __be16 type; /* This is really htons(ether_type). */ | 845 | __be16 type; /* This is really htons(ether_type). */ |
| 833 | struct net_device *dev; /* NULL is wildcarded here */ | 846 | struct net_device *dev; /* NULL is wildcarded here */ |