diff --git a/[refs] b/[refs] index f13b543bb2f0..5fe163a3c3fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d3352520273426e4c16e91d189aa8aa7ee5e96c5 +refs/heads/master: d8156534040996f6a93a24d3592d5d587f2587e5 diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h index 203c5504fe43..b54ec16dfbda 100644 --- a/trunk/include/linux/netdevice.h +++ b/trunk/include/linux/netdevice.h @@ -828,6 +828,19 @@ static inline void netif_napi_add(struct net_device *dev, set_bit(NAPI_STATE_SCHED, &napi->state); } +/** + * netif_napi_del - remove a napi context + * @napi: napi context + * + * netif_napi_del() removes a napi context from the network device napi list + */ +static inline void netif_napi_del(struct napi_struct *napi) +{ +#ifdef CONFIG_NETPOLL + list_del(&napi->dev_list); +#endif +} + struct packet_type { __be16 type; /* This is really htons(ether_type). */ struct net_device *dev; /* NULL is wildcarded here */