skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2025-05-08 14:33:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Change all MAC_FMT to %pM

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-05-30 15:51:53 -05:00
parent 61b38d5714
commit 925510ff1a
16 changed files with 128 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

14
os_dep/ioctl_cfg80211.c
View file

@ -1477,7 +1477,7 @@ static int cfg80211_rtw_get_station(struct wiphy *wiphy,
sinfo->filled = 0;
#ifdef CONFIG_DEBUG_CFG80211
DBG_88E(FUNC_NDEV_FMT" mac="MAC_FMT"\n", FUNC_NDEV_ARG(ndev), MAC_ARG(mac));
DBG_88E(FUNC_NDEV_FMT" mac=%pM\n", FUNC_NDEV_ARG(ndev), mac);
#endif
//for infra./P2PClient mode
@ -1489,7 +1489,7 @@ static int cfg80211_rtw_get_station(struct wiphy *wiphy,
if (_rtw_memcmp(mac, cur_network->network.MacAddress, ETH_ALEN) == false)
{
DBG_88E("%s, mismatch bssid="MAC_FMT"\n", __func__, MAC_ARG(cur_network->network.MacAddress));
DBG_88E("%s, mismatch bssid=%pM\n", __func__, cur_network->network.MacAddress);
return -ENOENT;
}
@ -2528,7 +2528,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,
if (sme->bssid)
DBG_88E("bssid="MAC_FMT"\n", MAC_ARG(sme->bssid));
DBG_88E("bssid=%pM\n", sme->bssid);
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == true)
@ -3155,8 +3155,8 @@ static int rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, struct net_de
goto fail;
}
DBG_88E("RTW_Tx:da="MAC_FMT" via "FUNC_NDEV_FMT"\n",
MAC_ARG(GetAddr1Ptr(buf)), FUNC_NDEV_ARG(ndev));
DBG_88E("RTW_Tx:da=%pM via "FUNC_NDEV_FMT"\n",
GetAddr1Ptr(buf), FUNC_NDEV_ARG(ndev));
#ifdef CONFIG_P2P
if ((type = rtw_p2p_check_frames(padapter, buf, len, true)) >= 0)
goto dump;
@ -3609,7 +3609,7 @@ static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndev
}
DBG_88E("free sta macaddr =" MAC_FMT "\n", MAC_ARG(mac));
DBG_88E("free sta macaddr =%pM\n", mac);
if (mac[0] == 0xff && mac[1] == 0xff &&
mac[2] == 0xff && mac[3] == 0xff &&
@ -4456,7 +4456,7 @@ static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy, struct net_device *ndev,
goto exit;
}
DBG_88E("RTW_Tx:tx_ch=%d, da="MAC_FMT"\n", tx_ch, MAC_ARG(GetAddr1Ptr(buf)));
DBG_88E("RTW_Tx:tx_ch=%d, da=%pM\n", tx_ch, GetAddr1Ptr(buf));
#ifdef CONFIG_P2P
if ((type = rtw_p2p_check_frames(padapter, buf, len, true)) >= 0)
goto dump;

30
os_dep/ioctl_linux.c
View file

@ -3866,7 +3866,7 @@ static int rtw_get_ap_info(struct net_device *dev,
if (_rtw_memcmp(bssid, pnetwork->network.MacAddress, ETH_ALEN) == true)//BSSID match, then check if supporting wpa/wpa2
{
DBG_88E("BSSID:" MAC_FMT "\n", MAC_ARG(bssid));
DBG_88E("BSSID:%pM\n", (bssid));
pbuf = rtw_get_wpa_ie(&pnetwork->network.IEs[12], &wpa_ielen, pnetwork->network.IELength-12);
if (pbuf && (wpa_ielen>0))
@ -6702,7 +6702,7 @@ static int rtw_dbg_port(struct net_device *dev,
struct recv_reorder_ctrl *preorder_ctrl;
DBG_88E("SSID=%s\n", cur_network->network.Ssid.Ssid);
DBG_88E("sta's macaddr:" MAC_FMT "\n", MAC_ARG(psta->hwaddr));
DBG_88E("sta's macaddr: %pM\n", psta->hwaddr);
DBG_88E("cur_channel=%d, cur_bwmode=%d, cur_ch_offset=%d\n", pmlmeext->cur_channel, pmlmeext->cur_bwmode, pmlmeext->cur_ch_offset);
DBG_88E("rtsen=%d, cts2slef=%d\n", psta->rtsen, psta->cts2self);
DBG_88E("state=0x%x, aid=%d, macid=%d, raid=%d\n", psta->state, psta->aid, psta->mac_id, psta->raid);
@ -6725,7 +6725,7 @@ static int rtw_dbg_port(struct net_device *dev,
}
else
{
DBG_88E("can't get sta's macaddr, cur_network's macaddr:" MAC_FMT "\n", MAC_ARG(cur_network->network.MacAddress));
DBG_88E("can't get sta's macaddr, cur_network's macaddr:%pM\n", (cur_network->network.MacAddress));
}
break;
case 0x06:
@ -6778,7 +6778,7 @@ static int rtw_dbg_port(struct net_device *dev,
if (extra_arg == psta->aid)
{
DBG_88E("sta's macaddr:" MAC_FMT "\n", MAC_ARG(psta->hwaddr));
DBG_88E("sta's macaddr:%pM\n", (psta->hwaddr));
DBG_88E("rtsen=%d, cts2slef=%d\n", psta->rtsen, psta->cts2self);
DBG_88E("state=0x%x, aid=%d, macid=%d, raid=%d\n", psta->state, psta->aid, psta->mac_id, psta->raid);
#ifdef CONFIG_80211N_HT
@ -7742,7 +7742,7 @@ static int rtw_add_sta(struct net_device *dev, struct ieee_param *param)
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct sta_priv *pstapriv = &padapter->stapriv;
DBG_88E("rtw_add_sta(aid=%d)=" MAC_FMT "\n", param->u.add_sta.aid, MAC_ARG(param->sta_addr));
DBG_88E("rtw_add_sta(aid=%d)=%pM\n", param->u.add_sta.aid, (param->sta_addr));
if (check_fwstate(pmlmepriv, (_FW_LINKED|WIFI_AP_STATE)) != true)
{
@ -7831,7 +7831,7 @@ static int rtw_del_sta(struct net_device *dev, struct ieee_param *param)
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct sta_priv *pstapriv = &padapter->stapriv;
DBG_88E("rtw_del_sta=" MAC_FMT "\n", MAC_ARG(param->sta_addr));
DBG_88E("rtw_del_sta=%pM\n", (param->sta_addr));
if (check_fwstate(pmlmepriv, (_FW_LINKED|WIFI_AP_STATE)) != true)
{
@ -7889,7 +7889,7 @@ static int rtw_ioctl_get_sta_data(struct net_device *dev, struct ieee_param *par
struct ieee_param_ex *param_ex = (struct ieee_param_ex *)param;
struct sta_data *psta_data = (struct sta_data *)param_ex->data;
DBG_88E("rtw_ioctl_get_sta_info, sta_addr: " MAC_FMT "\n", MAC_ARG(param_ex->sta_addr));
DBG_88E("rtw_ioctl_get_sta_info, sta_addr: %pM\n", (param_ex->sta_addr));
if (check_fwstate(pmlmepriv, (_FW_LINKED|WIFI_AP_STATE)) != true)
{
@ -7958,7 +7958,7 @@ static int rtw_get_sta_wpaie(struct net_device *dev, struct ieee_param *param)
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct sta_priv *pstapriv = &padapter->stapriv;
DBG_88E("rtw_get_sta_wpaie, sta_addr: " MAC_FMT "\n", MAC_ARG(param->sta_addr));
DBG_88E("rtw_get_sta_wpaie, sta_addr: %pM\n", (param->sta_addr));
if (check_fwstate(pmlmepriv, (_FW_LINKED|WIFI_AP_STATE)) != true)
{
@ -8486,7 +8486,7 @@ static int rtw_wx_set_priv(struct net_device *dev,
}
break;
case ANDROID_WIFI_CMD_MACADDR :
sprintf(ext, "MACADDR = " MAC_FMT, MAC_ARG(dev->dev_addr));
sprintf(ext, "MACADDR = %pM", (dev->dev_addr));
break;
case ANDROID_WIFI_CMD_SCAN_ACTIVE :
{
@ -11123,19 +11123,15 @@ static int rtw_tdls_enable(struct net_device *dev,
}
_exit_critical_bh(&pstapriv->sta_hash_lock, &irqL);
for (index=0; index< NUM_STA; index++)
{
if (!_rtw_memcmp(tdls_sta[index], empty_hwaddr, ETH_ALEN))
{
printk("issue tear down to "MAC_FMT"\n", MAC_ARG(tdls_sta[index]));
for (index=0; index< NUM_STA; index++) {
if (!_rtw_memcmp(tdls_sta[index], empty_hwaddr, ETH_ALEN)) {
pr_info("issue tear down to %pM\n", tdls_sta[index]);
issue_tdls_teardown(padapter, tdls_sta[index]);
}
}
rtw_tdls_cmd(padapter, myid(&(padapter->eeprompriv)), TDLS_RS_RCR);
rtw_reset_tdls_info(padapter);
}
else if (extra[ 0 ] == '1')
{
} else if (extra[ 0 ] == '1') {
ptdlsinfo->enable = 1;
}
#endif //CONFIG_TDLS

2
os_dep/mlme_linux.c
View file

@ -422,7 +422,7 @@ static int mgnt_netdev_open(struct net_device *pnetdev)
{
struct hostapd_priv *phostapdpriv = rtw_netdev_priv(pnetdev);
DBG_88E("mgnt_netdev_open: MAC Address:" MAC_FMT "\n", MAC_ARG(pnetdev->dev_addr));
DBG_88E("mgnt_netdev_open: MAC Address: %pM\n", pnetdev->dev_addr);
init_usb_anchor(&phostapdpriv->anchored);

2
os_dep/rtw_android.c
View file

@ -271,7 +271,7 @@ static int rtw_android_get_macaddr(struct net_device *net, char *command, int to
_adapter *adapter = (_adapter *)rtw_netdev_priv(net);
int bytes_written = 0;
bytes_written = snprintf(command, total_len, "Macaddr = "MAC_FMT, MAC_ARG(net->dev_addr));
bytes_written = snprintf(command, total_len, "Macaddr = %pM", net->dev_addr);
return bytes_written;
}

13
os_dep/usb_intf.c
View file

@ -962,12 +962,11 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
#ifdef CONFIG_LAYER2_ROAMING_RESUME
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) && check_fwstate(pmlmepriv, _FW_LINKED) )
{
//DBG_88E("%s:%d assoc_ssid:%s\n", __func__, __LINE__, pmlmepriv->assoc_ssid.Ssid);
DBG_88E("%s:%d %s(" MAC_FMT "), length:%d assoc_ssid.length:%d\n",__func__, __LINE__,
pmlmepriv->cur_network.network.Ssid.Ssid,
MAC_ARG(pmlmepriv->cur_network.network.MacAddress),
pmlmepriv->cur_network.network.Ssid.SsidLength,
pmlmepriv->assoc_ssid.SsidLength);
DBG_88E("%s:%d %s( %pM ), length:%d assoc_ssid.length:%d\n",__func__, __LINE__,
pmlmepriv->cur_network.network.Ssid.Ssid,
pmlmepriv->cur_network.network.MacAddress,
pmlmepriv->cur_network.network.Ssid.SsidLength,
pmlmepriv->assoc_ssid.SsidLength);
pmlmepriv->to_roaming = 1;
}
@ -1437,7 +1436,7 @@ _adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
rtw_macaddr_cfg(padapter->eeprompriv.mac_addr);
rtw_init_wifidirect_addrs(padapter, padapter->eeprompriv.mac_addr, padapter->eeprompriv.mac_addr);
_rtw_memcpy(pnetdev->dev_addr, padapter->eeprompriv.mac_addr, ETH_ALEN);
DBG_88E("MAC Address from pnetdev->dev_addr= " MAC_FMT "\n", MAC_ARG(pnetdev->dev_addr));
DBG_88E("MAC Address from pnetdev->dev_addr= %pM\n", pnetdev->dev_addr);
#ifdef CONFIG_HOSTAPD_MLME
hostapd_mode_init(padapter);