diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2014-05-31 11:50:46 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-19 15:57:38 -0700 |
| commit | 83a0ee45f5e5405893192aa1d206ddd29fa25478 (patch) | |
| tree | 261ecf4fcb7b1e7120a7c44ea2d598f55a53a37f | |
| parent | ccbf4415d613d49036005394aeb13c795992ae85 (diff) | |
| download | op-kernel-dev-83a0ee45f5e5405893192aa1d206ddd29fa25478.zip op-kernel-dev-83a0ee45f5e5405893192aa1d206ddd29fa25478.tar.gz | |
staging: vt6656: rename MACvDisableProtectMD to vnt_mac_disable_protect_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 e335a4d..093b583 100644 --- a/drivers/staging/vt6656/bssdb.c +++ b/drivers/staging/vt6656/bssdb.c @@ -950,7 +950,7 @@ void BSSvSecondCallBack(struct work_struct *work) pDevice->bProtectMode = true; } } else if (pDevice->bProtectMode) { - MACvDisableProtectMD(pDevice); + vnt_mac_disable_protect_mode(pDevice); pDevice->bProtectMode = false; } /* on/off short slot time */ diff --git a/drivers/staging/vt6656/mac.c b/drivers/staging/vt6656/mac.c index 1319b8a..96fff70 100644 --- a/drivers/staging/vt6656/mac.c +++ b/drivers/staging/vt6656/mac.c @@ -197,7 +197,7 @@ void vnt_mac_enable_protect_mode(struct vnt_private *priv) MAC_REG_ENCFG0, MESSAGE_REQUEST_MACREG, ARRAY_SIZE(data), data); } -void MACvDisableProtectMD(struct vnt_private *priv) +void vnt_mac_disable_protect_mode(struct vnt_private *priv) { u8 data[2]; diff --git a/drivers/staging/vt6656/mac.h b/drivers/staging/vt6656/mac.h index fa3cfc2..effab75 100644 --- a/drivers/staging/vt6656/mac.h +++ b/drivers/staging/vt6656/mac.h @@ -424,7 +424,7 @@ void vnt_mac_reg_bits_on(struct vnt_private *, u8, u8); void vnt_mac_write_word(struct vnt_private *, u8, u16); void vnt_mac_set_bssid_addr(struct vnt_private *, u8 *); void vnt_mac_enable_protect_mode(struct vnt_private *); -void MACvDisableProtectMD(struct vnt_private *); +void vnt_mac_disable_protect_mode(struct vnt_private *); void MACvEnableBarkerPreambleMd(struct vnt_private *); void MACvDisableBarkerPreambleMd(struct vnt_private *); void MACvWriteBeaconInterval(struct vnt_private *, u16); diff --git a/drivers/staging/vt6656/wmgr.c b/drivers/staging/vt6656/wmgr.c index bb1242c..f35fdd8 100644 --- a/drivers/staging/vt6656/wmgr.c +++ b/drivers/staging/vt6656/wmgr.c @@ -1657,7 +1657,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true) if (pDevice->bProtectMode) { vnt_mac_enable_protect_mode(pDevice); } else { - MACvDisableProtectMD(pDevice); + vnt_mac_disable_protect_mode(pDevice); } vnt_update_ifs(pDevice); } @@ -2031,7 +2031,7 @@ void vMgrCreateOwnIBSS(struct vnt_private *pDevice, PCMD_STATUS pStatus) // Disable Protect Mode pDevice->bProtectMode = 0; - MACvDisableProtectMD(pDevice); + vnt_mac_disable_protect_mode(pDevice); pDevice->bBarkerPreambleMd = 0; MACvDisableBarkerPreambleMd(pDevice); @@ -2389,7 +2389,7 @@ void vMgrJoinBSSBegin(struct vnt_private *pDevice, PCMD_STATUS pStatus) if (pDevice->bProtectMode) { vnt_mac_enable_protect_mode(pDevice); } else { - MACvDisableProtectMD(pDevice); + vnt_mac_disable_protect_mode(pDevice); } vnt_update_ifs(pDevice); } @@ -2565,7 +2565,7 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode, // Init the BSS informations pDevice->bProtectMode = false; - MACvDisableProtectMD(pDevice); + vnt_mac_disable_protect_mode(pDevice); pDevice->bBarkerPreambleMd = false; MACvDisableBarkerPreambleMd(pDevice); pDevice->bNonERPPresent = false; |
