diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-26 18:26:03 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-26 18:26:03 +1100 |
| commit | 7dacf842dba1515f097f9efe889e497adfc258ce (patch) | |
| tree | b25b366e96e42f3049b162a266abe19a253c2da5 /drivers/staging/hv/NetVscApi.h | |
| parent | 190e8cfcb9ac7ae9bbf6b7f54450292f365727dc (diff) | |
| parent | 78a22eafad6d9c3ce5400b3226a407ea784d7ed0 (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c
drivers/staging/sm7xx/smtc2d.c
drivers/staging/sm7xx/smtc2d.h
Diffstat (limited to 'drivers/staging/hv/NetVscApi.h')
| -rw-r--r-- | drivers/staging/hv/NetVscApi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/hv/NetVscApi.h b/drivers/staging/hv/NetVscApi.h index 1ce2b74a34a7..95d7a32b12f2 100644 --- a/drivers/staging/hv/NetVscApi.h +++ b/drivers/staging/hv/NetVscApi.h @@ -105,8 +105,6 @@ struct netvsc_driver { void (*OnLinkStatusChanged)(struct hv_device *dev, u32 Status); /* Specific to this driver */ - int (*OnOpen)(struct hv_device *dev); - int (*OnClose)(struct hv_device *dev); int (*OnSend)(struct hv_device *dev, struct hv_netvsc_packet *packet); void *Context; @@ -119,5 +117,7 @@ struct netvsc_device_info { /* Interface */ int NetVscInitialize(struct hv_driver *drv); +int RndisFilterOnOpen(struct hv_device *Device); +int RndisFilterOnClose(struct hv_device *Device); #endif /* _NETVSC_API_H_ */ |