diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-24 18:49:19 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-24 18:49:19 +1100 |
| commit | cf57f23b54d52ff875485f05171111a4ba79a6a2 (patch) | |
| tree | 81fff258d821ec475ecc779a788b8f809845b87f /drivers/staging/hv/RndisFilter.c | |
| parent | cfb7cc4a46f95413eb9c3ea364ec350ab33fad5a (diff) | |
| parent | 49408f8a88ff7660a7727ff7edbfb9b3a4d33ab3 (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/RndisFilter.c')
| -rw-r--r-- | drivers/staging/hv/RndisFilter.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/staging/hv/RndisFilter.c b/drivers/staging/hv/RndisFilter.c index 26d79975387c..1ab7fa97d373 100644 --- a/drivers/staging/hv/RndisFilter.c +++ b/drivers/staging/hv/RndisFilter.c @@ -85,10 +85,6 @@ static int RndisFilterOnDeviceRemove(struct hv_device *Device); static void RndisFilterOnCleanup(struct hv_driver *Driver); -static int RndisFilterOnOpen(struct hv_device *Device); - -static int RndisFilterOnClose(struct hv_device *Device); - static int RndisFilterOnSend(struct hv_device *Device, struct hv_netvsc_packet *Packet); @@ -654,8 +650,6 @@ int RndisFilterInit(struct netvsc_driver *Driver) Driver->Base.OnDeviceRemove = RndisFilterOnDeviceRemove; Driver->Base.OnCleanup = RndisFilterOnCleanup; Driver->OnSend = RndisFilterOnSend; - Driver->OnOpen = RndisFilterOnOpen; - Driver->OnClose = RndisFilterOnClose; /* Driver->QueryLinkStatus = RndisFilterQueryDeviceLinkStatus; */ Driver->OnReceiveCallback = RndisFilterOnReceive; @@ -888,7 +882,7 @@ static void RndisFilterOnCleanup(struct hv_driver *Driver) DPRINT_EXIT(NETVSC); } -static int RndisFilterOnOpen(struct hv_device *Device) +int RndisFilterOnOpen(struct hv_device *Device) { int ret; struct netvsc_device *netDevice = Device->Extension; @@ -903,7 +897,7 @@ static int RndisFilterOnOpen(struct hv_device *Device) return ret; } -static int RndisFilterOnClose(struct hv_device *Device) +int RndisFilterOnClose(struct hv_device *Device) { int ret; struct netvsc_device *netDevice = Device->Extension; |