diff --git a/rk3568/wifi/bcmdhd_wifi6/hdfadapt/hdf_bdh_mac80211.c b/rk3568/wifi/bcmdhd_wifi6/hdfadapt/hdf_bdh_mac80211.c
index 9724afc13a9ae8e3368410ab5772a82b76796cc6..49585b02755062d43ddb8480b8ac703f51907a89 100755
--- a/rk3568/wifi/bcmdhd_wifi6/hdfadapt/hdf_bdh_mac80211.c
+++ b/rk3568/wifi/bcmdhd_wifi6/hdfadapt/hdf_bdh_mac80211.c
@@ -257,6 +257,9 @@ int32_t BDH6WalGetDeviceMacAddr(NetDevice *hnetDev, int32_t type, uint8_t *mac,
     return HDF_SUCCESS;
 }
 
+#define MC3 3
+#define MC4 4
+#define MC5 5
 int32_t BDH6WalSetMacAddr(NetDevice *hnetDev, uint8_t *mac, uint8_t len)
 {
     int32_t retVal = 0;
@@ -276,8 +279,7 @@ int32_t BDH6WalSetMacAddr(NetDevice *hnetDev, uint8_t *mac, uint8_t len)
         return -1;
     }
     if (!is_valid_ether_addr(mac)) {
-        HDF_LOGE("%s: mac is invalid %02x:%02x:%02x:%02x:%02x:%02x", __func__,
-            mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+        HDF_LOGE("%s: mac is invalid xx:xx:xx:%02x:%02x:%02x", __func__, mac[MC3], mac[MC4], mac[MC5]);
         return -1;
     }
     
@@ -1020,9 +1022,8 @@ static int32_t HdfConnectEntry(NetDevice *hnetDev, WlanConnectParams *param)
     FillCfg80211ConnectParams(param, &cfg80211_params);
 
     HDF_LOGI("%s: %s connect ssid: %s", __func__, netDev->name, cfg80211_params.ssid);
-    HDF_LOGI("%s: cfg80211_params auth_type:%d--channelId:%d--centerFreq:%d--Mac:%02x:%02x:%02x:%02x:%02x:%02x",
+    HDF_LOGI("%s: cfg80211_params auth_type:%d--channelId:%d--centerFreq:%d--Mac:xx:xx:xx:%02x:%02x:%02x",
         __func__, cfg80211_params.auth_type, cfg80211_params.channel->band, param->centerFreq,
-        cfg80211_params.bssid[BD0], cfg80211_params.bssid[BD1], cfg80211_params.bssid[BD2],
         cfg80211_params.bssid[BD3], cfg80211_params.bssid[BD4], cfg80211_params.bssid[BD5]);
 
     bdh6_hdf_vxx_lock(ndev->ieee80211_ptr, 0);
@@ -1754,10 +1755,7 @@ int32_t WalAddIf(struct NetDevice *hnetDev, WifiIfAdd *ifAdd)
     
     // update mac addr to NetDevice object
     memcpy_s(p2p_hnetdev->macAddr, MAC_ADDR_SIZE, p2p_netdev->dev_addr, p2p_netdev->addr_len);
-    HDF_LOGI("%s: %s mac: %02x:%02x:%02x:%02x:%02x:%02x", __func__, p2p_hnetdev->name,
-        p2p_hnetdev->macAddr[M0],
-        p2p_hnetdev->macAddr[M1],
-        p2p_hnetdev->macAddr[M2],
+    HDF_LOGI("%s: %s mac: xx:xx:xx:%02x:%02x:%02x", __func__, p2p_hnetdev->name,
         p2p_hnetdev->macAddr[M3],
         p2p_hnetdev->macAddr[M4],
         p2p_hnetdev->macAddr[M5]);
diff --git a/rk3568/wifi/bcmdhd_wifi6/hdfadapt/net_bdh_adpater.c b/rk3568/wifi/bcmdhd_wifi6/hdfadapt/net_bdh_adpater.c
index b11474fe1a833c20eca64195543cbe9bc47a02a3..6502f443a92309039ebcbe5d7577c32c729f4161 100755
--- a/rk3568/wifi/bcmdhd_wifi6/hdfadapt/net_bdh_adpater.c
+++ b/rk3568/wifi/bcmdhd_wifi6/hdfadapt/net_bdh_adpater.c
@@ -382,9 +382,6 @@ int32_t hdf_p2p_netdev_ioctl(struct NetDevice *netDev, IfReq *req, int32_t cmd)
     return 0;
 }
 
-#define MC0 0
-#define MC1 1
-#define MC2 2
 #define MC3 3
 #define MC4 4
 #define MC5 5
@@ -403,8 +400,7 @@ int32_t hdf_bdh6_netdev_setmacaddr(struct NetDevice *netDev, void *addr)
     }
 
     if (!is_valid_ether_addr(mac)) {
-        HDF_LOGE("%s: mac is invalid %02x:%02x:%02x:%02x:%02x:%02x", __func__,
-            mac[MC0], mac[MC1], mac[MC2], mac[MC3], mac[MC4], mac[MC5]);
+        HDF_LOGE("%s: mac is invalid xx:xx:xx:%02x:%02x:%02x", __func__, mac[MC3], mac[MC4], mac[MC5]);
         return -1;
     }
     memcpy_s(sa.sa_data, ETH_ALEN, mac, ETH_ALEN);