Skip to content

Commit

Permalink
Staging: hv: netvsc_drv: Get the ring size information from struct ne…
Browse files Browse the repository at this point in the history
…tvsc_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>
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed May 17, 2011
1 parent 78001df commit aae2398
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/staging/hv/netvsc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1084,10 +1084,10 @@ int netvsc_device_add(struct hv_device *device, void *additional_info)
{
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) {
Expand Down Expand Up @@ -1116,8 +1116,8 @@ int netvsc_device_add(struct hv_device *device, void *additional_info)
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) {
Expand Down
1 change: 1 addition & 0 deletions drivers/staging/hv/netvsc_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,7 @@ static int netvsc_probe(struct hv_device *dev)
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);
Expand Down

0 comments on commit aae2398

Please sign in to comment.