diff --git a/[refs] b/[refs] index a05e3beb55bc..815d8e00879d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c7620cd029e427b4addc22a68b5a273d00b96904 +refs/heads/master: 10ffe98cdce196c0fc51ba94b28835100301a5f0 diff --git a/trunk/drivers/staging/hv/hyperv_net.h b/trunk/drivers/staging/hv/hyperv_net.h index cf7570f1f2c3..aaebac63929b 100644 --- a/trunk/drivers/staging/hv/hyperv_net.h +++ b/trunk/drivers/staging/hv/hyperv_net.h @@ -1077,8 +1077,5 @@ struct rndis_filter_packet { #define NDIS_PACKET_TYPE_MAC_FRAME 0x00000800 -/* Interface */ - -extern int rndis_filter_init(struct netvsc_driver *driver); #endif /* _HYPERV_NET_H */ diff --git a/trunk/drivers/staging/hv/netvsc.c b/trunk/drivers/staging/hv/netvsc.c index 2eaa667295f8..41cbb26eccbf 100644 --- a/trunk/drivers/staging/hv/netvsc.c +++ b/trunk/drivers/staging/hv/netvsc.c @@ -1168,12 +1168,9 @@ int netvsc_device_add(struct hv_device *device, void *additional_info) */ int netvsc_initialize(struct hv_driver *drv) { - struct netvsc_driver *driver = - drv_to_netvscdrv(&drv->driver); drv->name = driver_name; memcpy(&drv->dev_type, &netvsc_device_type, sizeof(struct hv_guid)); - rndis_filter_init(driver); return 0; } diff --git a/trunk/drivers/staging/hv/rndis_filter.c b/trunk/drivers/staging/hv/rndis_filter.c index ec68c755f643..60ebdb1b6082 100644 --- a/trunk/drivers/staging/hv/rndis_filter.c +++ b/trunk/drivers/staging/hv/rndis_filter.c @@ -568,11 +568,6 @@ static int rndis_filter_set_packet_filter(struct rndis_device *dev, return ret; } -int rndis_filter_init(struct netvsc_driver *drv) -{ - - return 0; -} static int rndis_filter_init_device(struct rndis_device *dev) {