diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2014-05-31 11:50:37 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-19 15:57:37 -0700 |
| commit | aa6907da1f6727711b0d58e24bbc8954d81289d0 (patch) | |
| tree | cc091c45f03725fe42b5e1be5a42e950dca139e8 | |
| parent | d10079105f00b2361571d9ee328e72a0015a923a (diff) | |
staging: vt6656: rename MACbShutdown to vnt_mac_shutdown
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/vt6656/mac.c | 2 | ||||
| -rw-r--r-- | drivers/staging/vt6656/mac.h | 2 | ||||
| -rw-r--r-- | drivers/staging/vt6656/main_usb.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/vt6656/mac.c b/drivers/staging/vt6656/mac.c index 8c73f3628010..5ee5376b2d99 100644 --- a/drivers/staging/vt6656/mac.c +++ b/drivers/staging/vt6656/mac.c @@ -69,7 +69,7 @@ void vnt_mac_set_filter(struct vnt_private *priv, u64 mc_filter) * * */ -void MACbShutdown(struct vnt_private *priv) +void vnt_mac_shutdown(struct vnt_private *priv) { vnt_control_out(priv, MESSAGE_TYPE_MACSHUTDOWN, 0, 0, 0, NULL); } diff --git a/drivers/staging/vt6656/mac.h b/drivers/staging/vt6656/mac.h index b0e5d495a5aa..9eee6d7da503 100644 --- a/drivers/staging/vt6656/mac.h +++ b/drivers/staging/vt6656/mac.h @@ -415,7 +415,7 @@ struct vnt_mac_set_key { } __packed; void vnt_mac_set_filter(struct vnt_private *, u64); -void MACbShutdown(struct vnt_private *); +void vnt_mac_shutdown(struct vnt_private *); void MACvSetBBType(struct vnt_private *, u8); void MACvDisableKeyEntry(struct vnt_private *, u8); void MACvSetKeyEntry(struct vnt_private *, u16, u32, u32, u8 *, u8 *); diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index b297f3afb5b4..11738dc4fb94 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -1002,9 +1002,9 @@ static int device_close(struct net_device *dev) for (uu = 0; uu < MAX_KEY_TABLE; uu++) MACvDisableKeyEntry(pDevice,uu); - if ((pDevice->flags & DEVICE_FLAGS_UNPLUG) == false) { - MACbShutdown(pDevice); - } + if ((pDevice->flags & DEVICE_FLAGS_UNPLUG) == false) + vnt_mac_shutdown(pDevice); + netif_stop_queue(pDevice->dev); MP_SET_FLAG(pDevice, fMP_DISCONNECTED); MP_CLEAR_FLAG(pDevice, fMP_POST_WRITES); |