Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 249099
b: refs/heads/master
c: af24ce4
h: refs/heads/master
i:
  249097: 6c74906
  249095: a23543d
v: v3
  • Loading branch information
Haiyang Zhang authored and Greg Kroah-Hartman committed Apr 25, 2011
1 parent 6fe4f37 commit e3d9541
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 31 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 57903f29cde4717d51123df0c9c7b670b6403ac5
refs/heads/master: af24ce42c51fad4fdc2eb3576b8c0388fd19ed4a
51 changes: 21 additions & 30 deletions trunk/drivers/staging/hv/netvsc.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,6 @@ static const struct hv_guid netvsc_device_type = {
}
};

static int netvsc_device_add(struct hv_device *device, void *additional_info);

static int netvsc_device_remove(struct hv_device *device);

static void netvsc_cleanup(struct hv_driver *driver);

static void netvsc_channel_cb(void *context);

static int netvsc_init_send_buf(struct hv_device *device);
Expand All @@ -66,9 +60,6 @@ static int netvsc_connect_vsp(struct hv_device *device);
static void netvsc_send_completion(struct hv_device *device,
struct vmpacket_descriptor *packet);

static int netvsc_send(struct hv_device *device,
struct hv_netvsc_packet *packet);

static void netvsc_receive(struct hv_device *device,
struct vmpacket_descriptor *packet);

Expand Down Expand Up @@ -173,27 +164,6 @@ static struct netvsc_device *release_inbound_net_device(
return net_device;
}

/*
* netvsc_initialize - Main entry point
*/
int netvsc_initialize(struct hv_driver *drv)
{
struct netvsc_driver *driver = (struct netvsc_driver *)drv;

drv->name = driver_name;
memcpy(&drv->dev_type, &netvsc_device_type, sizeof(struct hv_guid));

/* Setup the dispatch table */
driver->base.dev_add = netvsc_device_add;
driver->base.dev_rm = netvsc_device_remove;
driver->base.cleanup = netvsc_cleanup;

driver->send = netvsc_send;

rndis_filter_init(driver);
return 0;
}

static int netvsc_init_recv_buf(struct hv_device *device)
{
int ret = 0;
Expand Down Expand Up @@ -1228,3 +1198,24 @@ static void netvsc_channel_cb(void *context)
kfree(buffer);
return;
}

/*
* netvsc_initialize - Main entry point
*/
int netvsc_initialize(struct hv_driver *drv)
{
struct netvsc_driver *driver = (struct netvsc_driver *)drv;

drv->name = driver_name;
memcpy(&drv->dev_type, &netvsc_device_type, sizeof(struct hv_guid));

/* Setup the dispatch table */
driver->base.dev_add = netvsc_device_add;
driver->base.dev_rm = netvsc_device_remove;
driver->base.cleanup = netvsc_cleanup;

driver->send = netvsc_send;

rndis_filter_init(driver);
return 0;
}

0 comments on commit e3d9541

Please sign in to comment.