staging: vt6656: rename MACvWriteBSSIDAddress to vnt_mac_set_bssid_addr
authorMalcolm Priestley <tvboxspy@gmail.com>
Sat, 31 May 2014 10:50:44 +0000 (11:50 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 19 Jun 2014 22:57:38 +0000 (15:57 -0700)
drop write for set and shorten address.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6656/mac.c
drivers/staging/vt6656/mac.h
drivers/staging/vt6656/wmgr.c

index d0c3bd3a70ab24831acc1531caef93a2162fd5d8..1811d5f120b229dbd7c607aad99e35c5d0424712 100644 (file)
@@ -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);
index fa591311e2693927e8a46bdc31e16d3128237fa4..d2a44070e86df51c072392d7a52e25330d6515aa 100644 (file)
@@ -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 *);
index 66548ffb6f8aa2fd5996e6c193b22734fd80b718..0ed7cefa02e0c76fe52dd0e124791253ffc38233 100644 (file)
@@ -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);