From: Michal Schmidt <mschmidt@redhat.com>
To: David Miller <davem@davemloft.net>
Cc: Geoff Levand <geoff@infradead.org>,
netdev@vger.kernel.org, Eric Dumazet <edumazet@google.com>,
Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Subject: [PATCH v2 3/4] ps3_gelic: lower NAPI weight
Date: Fri, 23 Aug 2013 15:41:19 +0200 [thread overview]
Message-ID: <5217667F.5010207@redhat.com> (raw)
In-Reply-To: <1377118988.8674.82.camel@smoke>
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>
---
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(-)
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 */
--
1.8.3.1
next prev parent reply other threads:[~2013-08-23 13:41 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-21 16:49 [PATCH 0/4] drivers/net: fix too big NAPI weights Michal Schmidt
2013-08-21 16:49 ` [PATCH 1/4] jme: lower NAPI weight Michal Schmidt
2013-08-21 18:15 ` Sergei Shtylyov
2013-08-23 13:40 ` [PATCH v2 " Michal Schmidt
2013-08-27 19:00 ` David Miller
2013-08-21 16:49 ` [PATCH 2/4] netxen: " Michal Schmidt
2013-08-21 18:16 ` Sergei Shtylyov
2013-08-23 13:41 ` [PATCH v2 " Michal Schmidt
2013-08-27 19:00 ` David Miller
2013-08-21 16:49 ` [PATCH 3/4] ps3_gelic: " Michal Schmidt
2013-08-21 18:17 ` Sergei Shtylyov
2013-08-21 21:03 ` Geoff Levand
2013-08-23 13:41 ` Michal Schmidt [this message]
2013-08-27 19:00 ` [PATCH v2 " David Miller
2013-08-21 16:49 ` [PATCH 4/4] qlcnic: use standard NAPI weights Michal Schmidt
2013-08-21 18:19 ` Sergei Shtylyov
2013-08-22 6:51 ` Himanshu Madhani
2013-08-23 13:45 ` Michal Schmidt
2013-08-30 19:21 ` Himanshu Madhani
2013-09-04 13:03 ` [PATCH net-next v2] " Michal Schmidt
2013-09-05 16:46 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5217667F.5010207@redhat.com \
--to=mschmidt@redhat.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=geoff@infradead.org \
--cc=netdev@vger.kernel.org \
--cc=sergei.shtylyov@cogentembedded.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).