diff options
author | Malcolm Priestley <tvboxspy@gmail.com> | 2014-05-31 11:50:48 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-19 15:57:38 -0700 |
commit | 05827c93df800e3c79c3703e5620dbad979c8e8c (patch) | |
tree | 9049e1b6ca35d994677de9f17022eb4cddd9ad61 | |
parent | a085edc68245fd4ec9c761a4b8f0e543c18a1c09 (diff) | |
download | linux-05827c93df800e3c79c3703e5620dbad979c8e8c.tar.gz linux-05827c93df800e3c79c3703e5620dbad979c8e8c.tar.bz2 linux-05827c93df800e3c79c3703e5620dbad979c8e8c.zip |
staging: vt6656: rename MACvDisableBarkerPreambleMd to vnt_mac_disable_barker_preamble_mode
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/vt6656/bssdb.c | 2 | ||||
-rw-r--r-- | drivers/staging/vt6656/mac.c | 2 | ||||
-rw-r--r-- | drivers/staging/vt6656/mac.h | 2 | ||||
-rw-r--r-- | drivers/staging/vt6656/wmgr.c | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/vt6656/bssdb.c b/drivers/staging/vt6656/bssdb.c index 0a662e7c1d68..997a20ebc626 100644 --- a/drivers/staging/vt6656/bssdb.c +++ b/drivers/staging/vt6656/bssdb.c @@ -975,7 +975,7 @@ void BSSvSecondCallBack(struct work_struct *work) pDevice->bBarkerPreambleMd = true; } } else if (pDevice->bBarkerPreambleMd) { - MACvDisableBarkerPreambleMd(pDevice); + vnt_mac_disable_barker_preamble_mode(pDevice); pDevice->bBarkerPreambleMd = false; } diff --git a/drivers/staging/vt6656/mac.c b/drivers/staging/vt6656/mac.c index 94e9f95a436b..3275ee9fc2fd 100644 --- a/drivers/staging/vt6656/mac.c +++ b/drivers/staging/vt6656/mac.c @@ -219,7 +219,7 @@ void vnt_mac_enable_barker_preamble_mode(struct vnt_private *priv) MAC_REG_ENCFG2, MESSAGE_REQUEST_MACREG, ARRAY_SIZE(data), data); } -void MACvDisableBarkerPreambleMd(struct vnt_private *priv) +void vnt_mac_disable_barker_preamble_mode(struct vnt_private *priv) { u8 data[2]; diff --git a/drivers/staging/vt6656/mac.h b/drivers/staging/vt6656/mac.h index 9b0cac42711e..dfeacbfe5e54 100644 --- a/drivers/staging/vt6656/mac.h +++ b/drivers/staging/vt6656/mac.h @@ -426,7 +426,7 @@ void vnt_mac_set_bssid_addr(struct vnt_private *, u8 *); void vnt_mac_enable_protect_mode(struct vnt_private *); void vnt_mac_disable_protect_mode(struct vnt_private *); void vnt_mac_enable_barker_preamble_mode(struct vnt_private *); -void MACvDisableBarkerPreambleMd(struct vnt_private *); +void vnt_mac_disable_barker_preamble_mode(struct vnt_private *); void MACvWriteBeaconInterval(struct vnt_private *, u16); void vnt_mac_set_led(struct vnt_private *priv, u8, u8); diff --git a/drivers/staging/vt6656/wmgr.c b/drivers/staging/vt6656/wmgr.c index 7a5f6990b246..73c6e9019f2d 100644 --- a/drivers/staging/vt6656/wmgr.c +++ b/drivers/staging/vt6656/wmgr.c @@ -1670,7 +1670,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true) if (pDevice->bBarkerPreambleMd) { vnt_mac_enable_barker_preamble_mode(pDevice); } else { - MACvDisableBarkerPreambleMd(pDevice); + vnt_mac_disable_barker_preamble_mode(pDevice); } } } @@ -2034,7 +2034,7 @@ void vMgrCreateOwnIBSS(struct vnt_private *pDevice, PCMD_STATUS pStatus) vnt_mac_disable_protect_mode(pDevice); pDevice->bBarkerPreambleMd = 0; - MACvDisableBarkerPreambleMd(pDevice); + vnt_mac_disable_barker_preamble_mode(pDevice); // Kyle Test 2003.11.04 @@ -2402,7 +2402,7 @@ void vMgrJoinBSSBegin(struct vnt_private *pDevice, PCMD_STATUS pStatus) if (pDevice->bBarkerPreambleMd) { vnt_mac_enable_barker_preamble_mode(pDevice); } else { - MACvDisableBarkerPreambleMd(pDevice); + vnt_mac_disable_barker_preamble_mode(pDevice); } } } @@ -2567,7 +2567,7 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode, pDevice->bProtectMode = false; vnt_mac_disable_protect_mode(pDevice); pDevice->bBarkerPreambleMd = false; - MACvDisableBarkerPreambleMd(pDevice); + vnt_mac_disable_barker_preamble_mode(pDevice); pDevice->bNonERPPresent = false; pDevice->byPreambleType = 0; pDevice->wBasicRate = 0; |