Staging: benet: fix build errors when CONFIG_NETPOLL is off
Signed-off-by: Sathya Perla <sathyap@serverengines.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
diff --git a/drivers/staging/benet/Kconfig b/drivers/staging/benet/Kconfig
index ffb8ebd..f680607 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 e8d5b64..6113737 100644
--- a/drivers/staging/benet/TODO
+++ b/drivers/staging/benet/TODO
@@ -2,7 +2,6 @@
- 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
<subbus@serverengines.com> and Greg Kroah-Hartman <greg@kroah.com>
diff --git a/drivers/staging/benet/be_int.c b/drivers/staging/benet/be_int.c
index 20e5553..d67a288 100644
--- a/drivers/staging/benet/be_int.c
+++ b/drivers/staging/benet/be_int.c
@@ -717,12 +717,10 @@
*/
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);