| Message ID | 1377103771-1590-4-git-send-email-mschmidt@redhat.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On 08/21/2013 08:49 PM, Michal Schmidt wrote: > Since commit 82dc3c63 netif_napi_add() produces an error message if Likewise, need a summary line. > a NAPI poll weight greater than 64 is requested. > GELIC_NET_NAPI_WEIGHT is defined to GELIC_NET_RX_DESCRIPTORS, > which is 128. > Use the standard NAPI weight. > Signed-off-by: Michal Schmidt <mschmidt@redhat.com> > CC: Geoff Levand <geoff@infradead.org> WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, 2013-08-21 at 18:49 +0200, Michal Schmidt wrote: > Since commit 82dc3c63 netif_napi_add() produces an error message if > a NAPI poll weight greater than 64 is requested. > > GELIC_NET_NAPI_WEIGHT is defined to GELIC_NET_RX_DESCRIPTORS, > which is 128. > > Use the standard NAPI weight. > > Signed-off-by: Michal Schmidt <mschmidt@redhat.com> > CC: Geoff Levand <geoff@infradead.org> > --- > drivers/net/ethernet/toshiba/ps3_gelic_net.c | 3 +-- > drivers/net/ethernet/toshiba/ps3_gelic_net.h | 1 - > 2 files changed, 1 insertion(+), 3 deletions(-) Change looks fine. Please correct comment as Sergei suggested. Acked-by: Geoff Levand <geoff@infradead.org> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_net.c b/drivers/net/ethernet/toshiba/ps3_gelic_net.c index ad32af6..9c805e0 100644 --- a/drivers/net/ethernet/toshiba/ps3_gelic_net.c +++ b/drivers/net/ethernet/toshiba/ps3_gelic_net.c @@ -1466,8 +1466,7 @@ static void gelic_ether_setup_netdev_ops(struct net_device *netdev, { netdev->watchdog_timeo = GELIC_NET_WATCHDOG_TIMEOUT; /* NAPI */ - netif_napi_add(netdev, napi, - gelic_net_poll, GELIC_NET_NAPI_WEIGHT); + netif_napi_add(netdev, napi, gelic_net_poll, NAPI_POLL_WEIGHT); netdev->ethtool_ops = &gelic_ether_ethtool_ops; netdev->netdev_ops = &gelic_netdevice_ops; } diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_net.h b/drivers/net/ethernet/toshiba/ps3_gelic_net.h index a93df6a..309abb4 100644 --- a/drivers/net/ethernet/toshiba/ps3_gelic_net.h +++ b/drivers/net/ethernet/toshiba/ps3_gelic_net.h @@ -37,7 +37,6 @@ #define GELIC_NET_RXBUF_ALIGN 128 #define GELIC_CARD_RX_CSUM_DEFAULT 1 /* hw chksum */ #define GELIC_NET_WATCHDOG_TIMEOUT 5*HZ -#define GELIC_NET_NAPI_WEIGHT (GELIC_NET_RX_DESCRIPTORS) #define GELIC_NET_BROADCAST_ADDR 0xffffffffffffL #define GELIC_NET_MC_COUNT_MAX 32 /* multicast address list */
Since commit 82dc3c63 netif_napi_add() produces an error message if a NAPI poll weight greater than 64 is requested. GELIC_NET_NAPI_WEIGHT is defined to GELIC_NET_RX_DESCRIPTORS, which is 128. Use the standard NAPI weight. Signed-off-by: Michal Schmidt <mschmidt@redhat.com> CC: Geoff Levand <geoff@infradead.org> --- drivers/net/ethernet/toshiba/ps3_gelic_net.c | 3 +-- drivers/net/ethernet/toshiba/ps3_gelic_net.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-)