Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 249698
b: refs/heads/master
c: 10ffe98
h: refs/heads/master
v: v3
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed May 17, 2011
1 parent dafcc9c commit 60f276c
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 12 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: c7620cd029e427b4addc22a68b5a273d00b96904
refs/heads/master: 10ffe98cdce196c0fc51ba94b28835100301a5f0
3 changes: 0 additions & 3 deletions trunk/drivers/staging/hv/hyperv_net.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
3 changes: 0 additions & 3 deletions trunk/drivers/staging/hv/netvsc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
5 changes: 0 additions & 5 deletions trunk/drivers/staging/hv/rndis_filter.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down

0 comments on commit 60f276c

Please sign in to comment.