commit aae23986fd5baaf48c7112612fbff7fb1094ad03
author K. Y. Srinivasan <kys@microsoft.com> Thu May 12 19:35:05 2011 -0700
committer Greg Kroah-Hartman <gregkh@suse.de> Tue May 17 12:28:51 2011 -0700
tree 7a8b7cda2ceae46ac379f7c778428cd01ff0a2ea
parent 78001df39c563f5bc2e433ee65d0bafdb89cef43

Staging: hv: netvsc_drv: Get the ring size information from struct netvsc_device_info

Get the ring size information from struct netvsc_device_info.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

drivers/staging/hv/netvsc.c

diff --git a/drivers/staging/hv/netvsc.c b/drivers/staging/hv/netvsc.c
index 6ab5b77..2eaa667 100644
--- a/drivers/staging/hv/netvsc.c
+++ b/drivers/staging/hv/netvsc.c
@@ -1084,10 +1084,10 @@
 {
 	int ret = 0;
 	int i;
+	int ring_size =
+	((struct netvsc_device_info *)additional_info)->ring_size;
 	struct netvsc_device *net_device;
 	struct hv_netvsc_packet *packet, *pos;
-	struct netvsc_driver *net_driver =
-		drv_to_netvscdrv(device->device.driver);
 
 	net_device = alloc_net_device(device);
 	if (!net_device) {
@@ -1116,8 +1116,8 @@
 	init_completion(&net_device->channel_init_wait);
 
 	/* Open the channel */
-	ret = vmbus_open(device->channel, net_driver->ring_buf_size,
-			 net_driver->ring_buf_size, NULL, 0,
+	ret = vmbus_open(device->channel, ring_size * PAGE_SIZE,
+			 ring_size * PAGE_SIZE, NULL, 0,
 			 netvsc_channel_cb, device);
 
 	if (ret != 0) {

drivers/staging/hv/netvsc_drv.c

diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c
index 1b98202..6463f32 100644
--- a/drivers/staging/hv/netvsc_drv.c
+++ b/drivers/staging/hv/netvsc_drv.c
@@ -354,6 +354,7 @@
 	INIT_WORK(&net_device_ctx->work, netvsc_send_garp);
 
 	/* Notify the netvsc driver of the new device */
+	device_info.ring_size = ring_size;
 	ret = rndis_filte_device_add(dev, &device_info);
 	if (ret != 0) {
 		free_netdev(net);