diff options
author | K. Y. Srinivasan <kys@microsoft.com> | 2011-05-12 22:35:10 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-17 15:28:54 -0400 |
commit | 10ffe98cdce196c0fc51ba94b28835100301a5f0 (patch) | |
tree | afd4e254a1b787b0d4b5ba86f95d5a92e5eeebd4 /drivers/staging | |
parent | c7620cd029e427b4addc22a68b5a273d00b96904 (diff) |
Staging: hv: netvsc_drv: Get rid of the empty function rndis_filter_init()
Get rid of the empty function rndis_filter_init().
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')
-rw-r--r-- | drivers/staging/hv/hyperv_net.h | 3 | ||||
-rw-r--r-- | drivers/staging/hv/netvsc.c | 3 | ||||
-rw-r--r-- | drivers/staging/hv/rndis_filter.c | 5 |
3 files changed, 0 insertions, 11 deletions
diff --git a/drivers/staging/hv/hyperv_net.h b/drivers/staging/hv/hyperv_net.h index cf7570f1f2c..aaebac63929 100644 --- a/drivers/staging/hv/hyperv_net.h +++ b/drivers/staging/hv/hyperv_net.h | |||
@@ -1077,8 +1077,5 @@ struct rndis_filter_packet { | |||
1077 | #define NDIS_PACKET_TYPE_MAC_FRAME 0x00000800 | 1077 | #define NDIS_PACKET_TYPE_MAC_FRAME 0x00000800 |
1078 | 1078 | ||
1079 | 1079 | ||
1080 | /* Interface */ | ||
1081 | |||
1082 | extern int rndis_filter_init(struct netvsc_driver *driver); | ||
1083 | 1080 | ||
1084 | #endif /* _HYPERV_NET_H */ | 1081 | #endif /* _HYPERV_NET_H */ |
diff --git a/drivers/staging/hv/netvsc.c b/drivers/staging/hv/netvsc.c index 2eaa667295f..41cbb26eccb 100644 --- a/drivers/staging/hv/netvsc.c +++ b/drivers/staging/hv/netvsc.c | |||
@@ -1168,12 +1168,9 @@ cleanup: | |||
1168 | */ | 1168 | */ |
1169 | int netvsc_initialize(struct hv_driver *drv) | 1169 | int netvsc_initialize(struct hv_driver *drv) |
1170 | { | 1170 | { |
1171 | struct netvsc_driver *driver = | ||
1172 | drv_to_netvscdrv(&drv->driver); | ||
1173 | 1171 | ||
1174 | drv->name = driver_name; | 1172 | drv->name = driver_name; |
1175 | memcpy(&drv->dev_type, &netvsc_device_type, sizeof(struct hv_guid)); | 1173 | memcpy(&drv->dev_type, &netvsc_device_type, sizeof(struct hv_guid)); |
1176 | 1174 | ||
1177 | rndis_filter_init(driver); | ||
1178 | return 0; | 1175 | return 0; |
1179 | } | 1176 | } |
diff --git a/drivers/staging/hv/rndis_filter.c b/drivers/staging/hv/rndis_filter.c index ec68c755f64..60ebdb1b608 100644 --- a/drivers/staging/hv/rndis_filter.c +++ b/drivers/staging/hv/rndis_filter.c | |||
@@ -568,11 +568,6 @@ Exit: | |||
568 | return ret; | 568 | return ret; |
569 | } | 569 | } |
570 | 570 | ||
571 | int rndis_filter_init(struct netvsc_driver *drv) | ||
572 | { | ||
573 | |||
574 | return 0; | ||
575 | } | ||
576 | 571 | ||
577 | static int rndis_filter_init_device(struct rndis_device *dev) | 572 | static int rndis_filter_init_device(struct rndis_device *dev) |
578 | { | 573 | { |