From e3d95412fe51ada30168fa60dfc17d5ad220958f Mon Sep 17 00:00:00 2001 From: Haiyang Zhang Date: Thu, 21 Apr 2011 12:30:40 -0700 Subject: [PATCH] --- yaml --- r: 249099 b: refs/heads/master c: af24ce42c51fad4fdc2eb3576b8c0388fd19ed4a h: refs/heads/master i: 249097: 6c74906cd358a1a65273ccaa1898ef00ed20722b 249095: a23543d9c33df5965a46217c4ee68b157af2a2ef v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/netvsc.c | 51 +++++++++++++------------------ 2 files changed, 22 insertions(+), 31 deletions(-) diff --git a/[refs] b/[refs] index 884424ede448..55faa26cdb9b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 57903f29cde4717d51123df0c9c7b670b6403ac5 +refs/heads/master: af24ce42c51fad4fdc2eb3576b8c0388fd19ed4a diff --git a/trunk/drivers/staging/hv/netvsc.c b/trunk/drivers/staging/hv/netvsc.c index e8c15d2f373e..6eaecc11b0f4 100644 --- a/trunk/drivers/staging/hv/netvsc.c +++ b/trunk/drivers/staging/hv/netvsc.c @@ -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); @@ -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); @@ -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; @@ -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; +}