Commit 1cd34eaa authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: rename MACvWriteBSSIDAddress to vnt_mac_set_bssid_addr 



drop write for set and shorten address.

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 57dc49a6

drivers/staging/vt6656/mac.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/staging/vt6656/mac.h

+1 −1
Original line number Diff line number Diff line
@@ -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 *);

drivers/staging/vt6656/wmgr.c

+3 −3
Original line number Diff line number Diff line
@@ -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);