diff options
author | Neil Horman <nhorman@tuxdriver.com> | 2008-12-22 23:43:12 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-22 23:43:12 -0500 |
commit | 908a7a16b852ffd618a9127be8d62432182d81b4 (patch) | |
tree | a0b509227e26bef7edd347575761e0dbeb5756e7 /drivers/net/jme.h | |
parent | 889bd9b6dbcd426b8698c4a779dd7dbf247f57b8 (diff) |
net: Remove unused netdev arg from some NAPI interfaces.
When the napi api was changed to separate its 1:1 binding to the net_device
struct, the netif_rx_[prep|schedule|complete] api failed to remove the now
vestigual net_device structure parameter. This patch cleans up that api by
properly removing it..
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/jme.h')
-rw-r--r-- | drivers/net/jme.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/jme.h b/drivers/net/jme.h index adaf3ddbf78..2d6f30e638f 100644 --- a/drivers/net/jme.h +++ b/drivers/net/jme.h | |||
@@ -398,15 +398,15 @@ struct jme_ring { | |||
398 | #define JME_NAPI_WEIGHT(w) int w | 398 | #define JME_NAPI_WEIGHT(w) int w |
399 | #define JME_NAPI_WEIGHT_VAL(w) w | 399 | #define JME_NAPI_WEIGHT_VAL(w) w |
400 | #define JME_NAPI_WEIGHT_SET(w, r) | 400 | #define JME_NAPI_WEIGHT_SET(w, r) |
401 | #define JME_RX_COMPLETE(dev, napis) netif_rx_complete(dev, napis) | 401 | #define JME_RX_COMPLETE(dev, napis) netif_rx_complete(napis) |
402 | #define JME_NAPI_ENABLE(priv) napi_enable(&priv->napi); | 402 | #define JME_NAPI_ENABLE(priv) napi_enable(&priv->napi); |
403 | #define JME_NAPI_DISABLE(priv) \ | 403 | #define JME_NAPI_DISABLE(priv) \ |
404 | if (!napi_disable_pending(&priv->napi)) \ | 404 | if (!napi_disable_pending(&priv->napi)) \ |
405 | napi_disable(&priv->napi); | 405 | napi_disable(&priv->napi); |
406 | #define JME_RX_SCHEDULE_PREP(priv) \ | 406 | #define JME_RX_SCHEDULE_PREP(priv) \ |
407 | netif_rx_schedule_prep(priv->dev, &priv->napi) | 407 | netif_rx_schedule_prep(&priv->napi) |
408 | #define JME_RX_SCHEDULE(priv) \ | 408 | #define JME_RX_SCHEDULE(priv) \ |
409 | __netif_rx_schedule(priv->dev, &priv->napi); | 409 | __netif_rx_schedule(&priv->napi); |
410 | 410 | ||
411 | /* | 411 | /* |
412 | * Jmac Adapter Private data | 412 | * Jmac Adapter Private data |