From: Stephen Hemminger <stephen@networkplumber.org>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, Stephen Hemminger <sthemmin@microsoft.com>
Subject: [PATCH net-next 07/15] netvsc: convert ring_size to unsigned
Date: Wed, 3 May 2017 16:01:09 -0700 [thread overview]
Message-ID: <20170503230117.20070-8-sthemmin@microsoft.com> (raw)
In-Reply-To: <20170503230117.20070-1-sthemmin@microsoft.com>
The ring size module parameter is unsigned not integer.
Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
---
drivers/net/hyperv/hyperv_net.h | 5 ++---
drivers/net/hyperv/netvsc.c | 2 +-
drivers/net/hyperv/netvsc_drv.c | 8 ++++----
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
index 262b2ea576a3..2b4a9b058f6d 100644
--- a/drivers/net/hyperv/hyperv_net.h
+++ b/drivers/net/hyperv/hyperv_net.h
@@ -147,7 +147,7 @@ struct hv_netvsc_packet {
struct netvsc_device_info {
unsigned char mac_adr[ETH_ALEN];
bool link_state; /* 0 - link up, 1 - link down */
- int ring_size;
+ u32 ring_size;
u32 max_num_vrss_chns;
u32 num_chn;
};
@@ -766,8 +766,7 @@ struct netvsc_device {
/* Holds rndis device info */
void *extension;
- int ring_size;
-
+ u32 ring_size;
u32 max_pkt; /* max number of pkt in one send, e.g. 8 */
u32 pkt_align; /* alignment bytes, e.g. 8 */
diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
index cee8e020ac56..480bd7704b68 100644
--- a/drivers/net/hyperv/netvsc.c
+++ b/drivers/net/hyperv/netvsc.c
@@ -1304,7 +1304,7 @@ int netvsc_device_add(struct hv_device *device,
const struct netvsc_device_info *device_info)
{
int i, ret = 0;
- int ring_size = device_info->ring_size;
+ u32 ring_size = device_info->ring_size;
struct netvsc_device *net_device;
struct net_device *ndev = hv_get_drvdata(device);
struct net_device_context *net_device_ctx = netdev_priv(ndev);
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
index 3fef45421634..fb743c78f3dc 100644
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -43,8 +43,8 @@
#define RING_SIZE_MIN 64
#define LINKCHANGE_INT (2 * HZ)
-static int ring_size = 128;
-module_param(ring_size, int, S_IRUGO);
+static unsigned int ring_size = 128;
+module_param(ring_size, uint, 0444);
MODULE_PARM_DESC(ring_size, "Ring buffer size (# of pages)");
static const u32 default_msg = NETIF_MSG_DRV | NETIF_MSG_PROBE |
@@ -1713,8 +1713,8 @@ static int __init netvsc_drv_init(void)
if (ring_size < RING_SIZE_MIN) {
ring_size = RING_SIZE_MIN;
- pr_info("Increased ring_size to %d (min allowed)\n",
- ring_size);
+ pr_notice("Increased ring_size to %u (min allowed)\n",
+ ring_size);
}
ret = vmbus_driver_register(&netvsc_drv);
--
2.11.0
next prev parent reply other threads:[~2017-05-03 23:01 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-03 23:01 [PATCH net-next 00/15] netvsc: misc patches Stephen Hemminger
2017-05-03 23:01 ` [PATCH net-next 01/15] vmbus: simplify hv_ringbuffer_read Stephen Hemminger
2017-05-03 23:01 ` [PATCH net-next 02/15] vmbus: fix unnecessary signal events as result of NAPI Stephen Hemminger
2017-05-03 23:01 ` [PATCH net-next 03/15] netvsc: make sure napi enabled before vmbus_open Stephen Hemminger
2017-05-03 23:01 ` [PATCH net-next 04/15] netvsc: don't reacquire rtnl on device removal Stephen Hemminger
2017-05-03 23:01 ` [PATCH net-next 05/15] netvsc: optimize avail percent calculation Stephen Hemminger
2017-05-03 23:01 ` [PATCH net-next 06/15] netvsc: prefetch the first incoming ring element Stephen Hemminger
2017-05-03 23:01 ` Stephen Hemminger [this message]
2017-05-03 23:01 ` [PATCH net-next 08/15] netvsc: allow overriding send/recv buffer size Stephen Hemminger
2017-05-03 23:01 ` [PATCH net-next 09/15] netvsc: optimize netvsc_send_pkt Stephen Hemminger
2017-05-03 23:01 ` [PATCH net-next 10/15] netvsc: replace modulus with mask for alignment Stephen Hemminger
2017-05-03 23:01 ` [PATCH net-next 11/15] netvsc: reduce unnecessary memset Stephen Hemminger
2017-05-03 23:01 ` [PATCH net-next 12/15] netvsc: size receive completion ring based on receive area Stephen Hemminger
2017-05-03 23:01 ` [PATCH net-next 13/15] netvsc: convert open count from atomic to refcount Stephen Hemminger
2017-05-03 23:01 ` [PATCH net-next 14/15] netvsc: optimize receive completions Stephen Hemminger
2017-05-03 23:01 ` [PATCH 15/15] netvsc: use vzalloc_node for receive completion data Stephen Hemminger
2017-05-03 23:35 ` [PATCH net-next 00/15] netvsc: misc patches 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=20170503230117.20070-8-sthemmin@microsoft.com \
--to=stephen@networkplumber.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=sthemmin@microsoft.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).