diff options
| author |   K. Y. Srinivasan <kys@microsoft.com> | 2011-05-12 19:34:59 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-17 12:27:18 -0700 |
| commit | e3f8a80efbf8a857fd26b5154c66b3fb614e5bbd (patch) | |
| tree | cec76dec866bf3f1522c47aae78fe352955d5717 /drivers/staging/hv | |
| parent | Staging: hv: netvsc_drv: Directly invoke the function rndis_filter_receive() (diff) | |
| download | linux-dev-e3f8a80efbf8a857fd26b5154c66b3fb614e5bbd.tar.xz linux-dev-e3f8a80efbf8a857fd26b5154c66b3fb614e5bbd.zip | |
Staging: hv: netvsc_drv: Get rid of unnecessary state in struct netvsc_driver
Since the function pointers in struct netvsc_driver are no longer used
(as these are invoked directly), get rid of this unused state.
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>
Diffstat (limited to 'drivers/staging/hv')
| -rw-r--r-- | drivers/staging/hv/hyperv_net.h | 11 | ||||
| -rw-r--r-- | drivers/staging/hv/netvsc.c | 3 | ||||
| -rw-r--r-- | drivers/staging/hv/netvsc_drv.c | 2 | ||||
| -rw-r--r-- | drivers/staging/hv/rndis_filter.c | 10 |
4 files changed, 0 insertions, 26 deletions
diff --git a/drivers/staging/hv/hyperv_net.h b/drivers/staging/hv/hyperv_net.h index 820008ed020b..03f37da46540 100644 --- a/drivers/staging/hv/hyperv_net.h +++ b/drivers/staging/hv/hyperv_net.h @@ -90,17 +90,6 @@ struct netvsc_driver { u32 ring_buf_size; u32 req_ext_size; - /* - * This is set by the caller to allow us to callback when we - * receive a packet from the "wire" - */ - int (*recv_cb)(struct hv_device *dev, - struct hv_netvsc_packet *packet); - void (*link_status_change)(struct hv_device *dev, u32 status); - - /* Specific to this driver */ - int (*send)(struct hv_device *dev, struct hv_netvsc_packet *packet); - }; static inline diff --git a/drivers/staging/hv/netvsc.c b/drivers/staging/hv/netvsc.c index 85e7ea6858e6..6ab5b77936ab 100644 --- a/drivers/staging/hv/netvsc.c +++ b/drivers/staging/hv/netvsc.c @@ -1174,9 +1174,6 @@ int netvsc_initialize(struct hv_driver *drv) drv->name = driver_name; memcpy(&drv->dev_type, &netvsc_device_type, sizeof(struct hv_guid)); - - driver->send = netvsc_send; - rndis_filter_init(driver); return 0; } diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c index 01812bd8ea6c..cade6e68335e 100644 --- a/drivers/staging/hv/netvsc_drv.c +++ b/drivers/staging/hv/netvsc_drv.c @@ -446,8 +446,6 @@ static int netvsc_drv_init(int (*drv_init)(struct hv_driver *drv)) int ret; net_drv_obj->ring_buf_size = ring_size * PAGE_SIZE; - net_drv_obj->recv_cb = netvsc_recv_callback; - net_drv_obj->link_status_change = netvsc_linkstatus_callback; /* Callback to client driver to complete the initialization */ drv_init(&net_drv_obj->base); diff --git a/drivers/staging/hv/rndis_filter.c b/drivers/staging/hv/rndis_filter.c index 9a6c0647d5b3..ca922d8c2b9e 100644 --- a/drivers/staging/hv/rndis_filter.c +++ b/drivers/staging/hv/rndis_filter.c @@ -596,16 +596,6 @@ int rndis_filter_init(struct netvsc_driver *drv) ASSERT(Driver->OnLinkStatusChanged); rndisDriver->OnLinkStatusChanged = Driver->OnLinkStatusChanged;*/ - /* Save the original dispatch handlers before we override it */ - rndis_filter.inner_drv.send = drv->send; - rndis_filter.inner_drv.recv_cb = drv->recv_cb; - rndis_filter.inner_drv.link_status_change = - drv->link_status_change; - - /* Override */ - drv->send = rndis_filter_send; - drv->recv_cb = rndis_filter_receive; - return 0; } |