diff options
| author |   Sathya Perla <sathyap@serverengines.com> | 2008-11-13 11:13:32 +0530 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-06 13:52:15 -0800 |
| commit | d6258716b53e1f25e0a219137640fc8a459591a3 (patch) | |
| tree | f6e7b6d8a728bcbfcc54009de4973c21ea580c45 /drivers/staging/benet | |
| parent | Staging: benet: patch to remove subdirectories (diff) | |
| download | linux-dev-d6258716b53e1f25e0a219137640fc8a459591a3.tar.xz linux-dev-d6258716b53e1f25e0a219137640fc8a459591a3.zip | |
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>
Diffstat (limited to 'drivers/staging/benet')
| -rw-r--r-- | drivers/staging/benet/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/staging/benet/TODO | 1 | ||||
| -rw-r--r-- | drivers/staging/benet/be_int.c | 6 |
3 files changed, 3 insertions, 6 deletions
diff --git a/drivers/staging/benet/Kconfig b/drivers/staging/benet/Kconfig index ffb8ebdfd168..f6806074f998 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 e8d5b6463f42..6113737b2299 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 <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 20e55538bc65..d67a2886d694 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); |