]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
ps3_gelic: lower NAPI weight
authorMichal Schmidt <mschmidt@redhat.com>
Fri, 23 Aug 2013 13:41:19 +0000 (15:41 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 27 Aug 2013 18:59:27 +0000 (14:59 -0400)
Since commit 82dc3c63 ("net: introduce NAPI_POLL_WEIGHT")
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.

v2: proper reference to the related commit

Signed-off-by: Michal Schmidt <mschmidt@redhat.com>
Acked-by: Geoff Levand <geoff@infradead.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/toshiba/ps3_gelic_net.c
drivers/net/ethernet/toshiba/ps3_gelic_net.h

index ad32af67e618c05ee67ec0505c161ec0c2415d13..9c805e0c0cae87bd81bb305a6c51cb3c58b479e1 100644 (file)
@@ -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;
 }
index a93df6ac190980f697aaf3c20c47970113359f1e..309abb472aa2040e978fea46faff0cfd81c0bb43 100644 (file)
@@ -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 */