From: Sathya Perla Date: Thu, 13 Nov 2008 05:43:32 +0000 (+0530) Subject: Staging: benet: fix build errors when CONFIG_NETPOLL is off X-Git-Tag: v2.6.29-rc1~228^2~99 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d6258716b53e1f25e0a219137640fc8a459591a3;p=linux-2.6-omap-h63xx.git Staging: benet: fix build errors when CONFIG_NETPOLL is off Signed-off-by: Sathya Perla Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/benet/Kconfig b/drivers/staging/benet/Kconfig index ffb8ebdfd16..f6806074f99 100644 --- a/drivers/staging/benet/Kconfig +++ b/drivers/staging/benet/Kconfig @@ -1,6 +1,6 @@ config BENET tristate "ServerEngines 10Gb NIC - BladeEngine" - depends on PCI && INET && NETPOLL + depends on PCI && INET select INET_LRO help This driver implements the NIC functionality for ServerEngines diff --git a/drivers/staging/benet/TODO b/drivers/staging/benet/TODO index e8d5b6463f4..6113737b229 100644 --- a/drivers/staging/benet/TODO +++ b/drivers/staging/benet/TODO @@ -2,7 +2,6 @@ TODO: - fix minor checkpatch.pl issues - remove wrappers around common iowrite functions - full netdev audit of common problems/issues - - fix build errors when CONFIG_NETPOLL is not enabled Please send all patches and questions to Subbu Seetharaman and Greg Kroah-Hartman diff --git a/drivers/staging/benet/be_int.c b/drivers/staging/benet/be_int.c index 20e55538bc6..d67a2886d69 100644 --- a/drivers/staging/benet/be_int.c +++ b/drivers/staging/benet/be_int.c @@ -717,12 +717,10 @@ irqreturn_t be_int(int irq, void *dev) */ int be_poll(struct napi_struct *napi, int budget) { - struct net_device *netdev = napi->dev; - struct be_net_object *pnob = netdev_priv(netdev); - struct be_adapter *adapter = pnob->adapter; + struct be_net_object *pnob = container_of(napi, struct be_net_object, napi); u32 work_done; - adapter->be_stat.bes_polls++; + pnob->adapter->be_stat.bes_polls++; work_done = process_rx_completions(pnob, budget); BUG_ON(work_done > budget);