diff options
| author | Malcolm Priestley | 2014-05-31 12:50:44 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-06-20 00:57:38 +0200 |
| commit | 1cd34eaa28dfca509f1713e327eaa0aaccbf0227 (patch) | |
| tree | 24f439973abed40c32c5880dfcb070e8e5f16391 | |
| parent | staging: vt6656: rename MACvWriteWord to vnt_mac_write_word (diff) | |
| download | kernel-qcow2-linux-1cd34eaa28dfca509f1713e327eaa0aaccbf0227.tar.gz kernel-qcow2-linux-1cd34eaa28dfca509f1713e327eaa0aaccbf0227.tar.xz kernel-qcow2-linux-1cd34eaa28dfca509f1713e327eaa0aaccbf0227.zip | |
staging: vt6656: rename MACvWriteBSSIDAddress to vnt_mac_set_bssid_addr
drop write for set and shorten address.
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/wmgr.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/vt6656/mac.c b/drivers/staging/vt6656/mac.c index d0c3bd3a70ab..1811d5f120b2 100644 --- a/drivers/staging/vt6656/mac.c +++ b/drivers/staging/vt6656/mac.c @@ -180,7 +180,7 @@ void vnt_mac_write_word(struct vnt_private *priv, u8 reg_ofs, u16 word) reg_ofs, MESSAGE_REQUEST_MACREG, ARRAY_SIZE(data), data); } -void MACvWriteBSSIDAddress(struct vnt_private *priv, u8 *addr) +void vnt_mac_set_bssid_addr(struct vnt_private *priv, u8 *addr) { vnt_control_out(priv, MESSAGE_TYPE_WRITE, MAC_REG_BSSID0, MESSAGE_REQUEST_MACREG, ETH_ALEN, addr); diff --git a/drivers/staging/vt6656/mac.h b/drivers/staging/vt6656/mac.h index fa591311e269..d2a44070e86d 100644 --- a/drivers/staging/vt6656/mac.h +++ b/drivers/staging/vt6656/mac.h @@ -422,7 +422,7 @@ void vnt_mac_set_keyentry(struct vnt_private *, u16, u32, u32, u8 *, u8 *); void vnt_mac_reg_bits_off(struct vnt_private *, u8, u8); void vnt_mac_reg_bits_on(struct vnt_private *, u8, u8); void vnt_mac_write_word(struct vnt_private *, u8, u16); -void MACvWriteBSSIDAddress(struct vnt_private *, u8 *); +void vnt_mac_set_bssid_addr(struct vnt_private *, u8 *); void MACvEnableProtectMD(struct vnt_private *); void MACvDisableProtectMD(struct vnt_private *); void MACvEnableBarkerPreambleMd(struct vnt_private *); diff --git a/drivers/staging/vt6656/wmgr.c b/drivers/staging/vt6656/wmgr.c index 66548ffb6f8a..0ed7cefa02e0 100644 --- a/drivers/staging/vt6656/wmgr.c +++ b/drivers/staging/vt6656/wmgr.c @@ -1920,7 +1920,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true) vnt_update_next_tbtt(pDevice, qwTimestamp, pMgmt->wCurrBeaconPeriod); // Turn off bssid filter to avoid filter others adhoc station which bssid is different. - MACvWriteBSSIDAddress(pDevice, pMgmt->abyCurrBSSID); + vnt_mac_set_bssid_addr(pDevice, pMgmt->abyCurrBSSID); byOldPreambleType = pDevice->byPreambleType; if (WLAN_GET_CAP_INFO_SHORTPREAMBLE(*sFrame.pwCapInfo)) { @@ -2139,7 +2139,7 @@ void vMgrCreateOwnIBSS(struct vnt_private *pDevice, PCMD_STATUS pStatus) } // set BSSID filter - MACvWriteBSSIDAddress(pDevice, pMgmt->abyCurrBSSID); + vnt_mac_set_bssid_addr(pDevice, pMgmt->abyCurrBSSID); memcpy(pDevice->abyBSSID, pMgmt->abyCurrBSSID, WLAN_ADDR_LEN); vnt_mac_reg_bits_on(pDevice, MAC_REG_RCR, RCR_BSSID); @@ -2586,7 +2586,7 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode, vnt_reset_next_tbtt(pDevice, pCurr->wBeaconInterval); // set BSSID - MACvWriteBSSIDAddress(pDevice, pCurr->abyBSSID); + vnt_mac_set_bssid_addr(pDevice, pCurr->abyBSSID); memcpy(pMgmt->abyCurrBSSID, pCurr->abyBSSID, 6); |