OSDN Git Service

Convert __FUNCTION__ to __func__
authorLarry Finger <Larry.Finger@lwfinger.net>
Sun, 5 May 2013 16:53:24 +0000 (11:53 -0500)
committerLarry Finger <Larry.Finger@lwfinger.net>
Sun, 5 May 2013 16:53:24 +0000 (11:53 -0500)
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
39 files changed:
core/rtw_efuse.c
core/rtw_p2p.c
core/rtw_recv.c
core/rtw_security.c
core/rtw_sreset.c
core/rtw_sta_mgt.c
core/rtw_tdls.c
core/rtw_wlan_util.c
core/rtw_xmit.c
hal/HalDMOutSrc8192C_CE.c
hal/hal_intf.c
hal/odm.c
hal/rtl8723a_cmd.c
hal/rtl8723a_hal_init.c
hal/rtl8723a_sreset.c
hal/rtl8723au_recv.c
hal/rtl8723au_xmit.c
hal/usb_halinit.c
hal/usb_ops_linux.c
include/osdep_service.h
include/rtl8723a_bt-coexist.h
include/rtw_debug.h
include/rtw_io.h
include/rtw_ioctl.h
include/rtw_iol.h
include/rtw_mlme_ext.h
include/rtw_p2p.h
include/rtw_pwrctrl.h
include/rtw_wapi.h
os_dep/ioctl_cfg80211.c
os_dep/ioctl_linux.c
os_dep/mlme_linux.c
os_dep/os_intfs.c
os_dep/osdep_service.c
os_dep/recv_linux.c
os_dep/rtw_android.c
os_dep/usb_intf.c
os_dep/usb_ops_linux.c
os_dep/xmit_linux.c

index 9ae820d..43296ff 100644 (file)
@@ -755,9 +755,9 @@ u8 rtw_BT_efuse_map_write(PADAPTER padapter, u16 addr, u16 cnts, u8 *data)
                }
 
                if (word_en != 0xF) {
-                       DBG_871X("%s: offset =%#X\n", __FUNCTION__, offset);
-                       DBG_871X("%s: word_en =%#X\n", __FUNCTION__, word_en);
-                       DBG_871X("%s: data =", __FUNCTION__);
+                       DBG_871X("%s: offset =%#X\n", __func__, offset);
+                       DBG_871X("%s: word_en =%#X\n", __func__, word_en);
+                       DBG_871X("%s: data =", __func__);
                        for (i = 0; i < PGPKT_DATA_SIZE; i++)
                                DBG_871X("0x%02X ", newdata[i]);
                        DBG_871X("\n");
@@ -1084,7 +1084,7 @@ int storeAdaptorInfoFile(char *path, struct eeprom_priv *eeprom_priv)
                else
                        ret = _FAIL;
        } else {
-               DBG_871X("%s NULL pointer\n", __FUNCTION__);
+               DBG_871X("%s NULL pointer\n", __func__);
                ret =  _FAIL;
        }
        return ret;
@@ -1104,7 +1104,7 @@ int retriveAdaptorInfoFile(char *path, struct eeprom_priv *eeprom_priv)
                else
                        ret = _FAIL;
        } else {
-               DBG_871X("%s NULL pointer\n", __FUNCTION__);
+               DBG_871X("%s NULL pointer\n", __func__);
                ret = _FAIL;
        }
        return ret;
index ccc81a7..17efed2 100644 (file)
@@ -78,7 +78,7 @@ static u32 go_add_group_info_attr(struct wifidirect_info *pwdinfo, u8 *pbuf)
        _adapter *padapter = pwdinfo->padapter;
        struct sta_priv *pstapriv = &padapter->stapriv;
 
-       DBG_871X("%s\n", __FUNCTION__);
+       DBG_871X("%s\n", __func__);
 
        pdata_attr = rtw_zmalloc(MAX_P2P_IE_LEN);
 
@@ -183,7 +183,7 @@ static void issue_group_disc_req(struct wifidirect_info *pwdinfo, u8 *da)
        u8      oui_subtype = P2P_GO_DISC_REQUEST;
        u8      dialogToken=0;
 
-       DBG_871X("[%s]\n", __FUNCTION__);
+       DBG_871X("[%s]\n", __func__);
 
        if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)
        {
@@ -244,7 +244,7 @@ static void issue_p2p_devdisc_resp(struct wifidirect_info *pwdinfo, u8 *da, u8 s
        u8 p2pie[8] = { 0x00 };
        u32 p2pielen = 0;
 
-       DBG_871X("[%s]\n", __FUNCTION__);
+       DBG_871X("[%s]\n", __func__);
 
        if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)
        {
@@ -411,7 +411,7 @@ static void issue_p2p_presence_resp(struct wifidirect_info *pwdinfo, u8 *da, u8
        u8 noa_attr_content[32] = { 0x00 };
        u32 p2pielen = 0;
 
-       DBG_871X("[%s]\n", __FUNCTION__);
+       DBG_871X("[%s]\n", __func__);
 
        if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)
        {
@@ -2272,12 +2272,12 @@ u32 process_assoc_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint l
 
        if ( !p2p_ie )
        {
-               DBG_8192C( "[%s] P2P IE not Found!!\n", __FUNCTION__ );
+               DBG_8192C( "[%s] P2P IE not Found!!\n", __func__ );
                status_code =  P2P_STATUS_FAIL_INVALID_PARAM;
        }
        else
        {
-               DBG_8192C( "[%s] P2P IE Found!!\n", __FUNCTION__ );
+               DBG_8192C( "[%s] P2P IE Found!!\n", __func__ );
        }
 
        while ( p2p_ie )
@@ -2285,7 +2285,7 @@ u32 process_assoc_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint l
                //Check P2P Capability ATTR
                if ( rtw_get_p2p_attr_content( p2p_ie, p2p_ielen, P2P_ATTR_CAPABILITY, (u8*)&cap_attr, (uint*) &attr_contentlen) )
                {
-                       DBG_8192C( "[%s] Got P2P Capability Attr!!\n", __FUNCTION__ );
+                       DBG_8192C( "[%s] Got P2P Capability Attr!!\n", __func__ );
                        cap_attr = le16_to_cpu(cap_attr);
                        psta->dev_cap = cap_attr&0xff;
                }
@@ -2296,7 +2296,7 @@ u32 process_assoc_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint l
                //Check P2P Device Info ATTR
                if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_DEVICE_INFO, NULL, (uint*)&attr_contentlen))
                {
-                       DBG_8192C( "[%s] Got P2P DEVICE INFO Attr!!\n", __FUNCTION__ );
+                       DBG_8192C( "[%s] Got P2P DEVICE INFO Attr!!\n", __func__ );
                        pattr_content = pbuf = rtw_zmalloc(attr_contentlen);
                        if (pattr_content)
                        {
@@ -2501,7 +2501,7 @@ u8 process_p2p_provdisc_req(struct wifidirect_info *pwdinfo,  u8 *pframe, uint l
                        issue_p2p_provision_resp( pwdinfo, GetAddr2Ptr(pframe), frame_body, uconfig_method);
                }
        }
-       DBG_871X( "[%s] config method = %s\n", __FUNCTION__, pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req );
+       DBG_871X( "[%s] config method = %s\n", __func__, pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req );
        return true;
 
 }
@@ -2631,7 +2631,7 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
        }
        else
        {
-               DBG_871X( "[%s] WPS IE not Found!!\n", __FUNCTION__ );
+               DBG_871X( "[%s] WPS IE not Found!!\n", __func__ );
                result = P2P_STATUS_FAIL_INCOMPATIBLE_PARAM;
                rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL);
                return( result );
@@ -2644,7 +2644,7 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
 
        if ( !p2p_ie )
        {
-               DBG_871X( "[%s] P2P IE not Found!!\n", __FUNCTION__ );
+               DBG_871X( "[%s] P2P IE not Found!!\n", __func__ );
                result = P2P_STATUS_FAIL_INCOMPATIBLE_PARAM;
                rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL);
        }
@@ -2676,7 +2676,7 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
 
                if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_GO_INTENT , &attr_content, &attr_contentlen) )
                {
-                       DBG_871X( "[%s] GO Intent = %d, tie = %d\n", __FUNCTION__, attr_content >> 1, attr_content & 0x01 );
+                       DBG_871X( "[%s] GO Intent = %d, tie = %d\n", __func__, attr_content >> 1, attr_content & 0x01 );
                        pwdinfo->peer_intent = attr_content;    //      include both intent and tie breaker values.
 
                        if ( pwdinfo->intent == ( pwdinfo->peer_intent >> 1 ) )
@@ -2733,7 +2733,7 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
 
                        if ( ch_num_inclusioned == 0)
                        {
-                               DBG_871X( "[%s] No common channel in channel list!\n", __FUNCTION__ );
+                               DBG_871X( "[%s] No common channel in channel list!\n", __func__ );
                                result = P2P_STATUS_FAIL_NO_COMMON_CH;
                                rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL);
                                break;
@@ -2747,7 +2747,7 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
 #ifdef CONFIG_CONCURRENT_MODE
                                        if ( check_buddy_fwstate(padapter, _FW_LINKED ) )
                                        {
-                                               DBG_871X( "[%s] desired channel NOT Found!\n", __FUNCTION__ );
+                                               DBG_871X( "[%s] desired channel NOT Found!\n", __func__ );
                                                result = P2P_STATUS_FAIL_NO_COMMON_CH;
                                                rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL);
                                                break;
@@ -2770,13 +2770,13 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
                                                         *      Change our operating channel as peer's for compatibility.
                                                         */
                                                        pwdinfo->operating_channel = peer_operating_ch;
-                                                       DBG_871X( "[%s] Change op ch to %02x as peer's\n", __FUNCTION__, pwdinfo->operating_channel);
+                                                       DBG_871X( "[%s] Change op ch to %02x as peer's\n", __func__, pwdinfo->operating_channel);
                                                }
                                                else
                                                {
                                                        // Take first channel of ch_list_inclusioned as operating channel
                                                        pwdinfo->operating_channel = ch_list_inclusioned[0];
-                                                       DBG_871X( "[%s] Change op ch to %02x\n", __FUNCTION__, pwdinfo->operating_channel);
+                                                       DBG_871X( "[%s] Change op ch to %02x\n", __func__, pwdinfo->operating_channel);
                                                }
                                        }
 
@@ -2796,12 +2796,12 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
                u8      attr_content[ 10 ] = { 0x00 };
                u32     attr_contentlen = 0;
 
-               DBG_871X( "[%s] WFD IE Found!!\n", __FUNCTION__ );
+               DBG_871X( "[%s] WFD IE Found!!\n", __func__ );
                rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, attr_content, &attr_contentlen);
                if ( attr_contentlen )
                {
                        pwdinfo->wfd_info->peer_rtsp_ctrlport = RTW_GET_BE16( attr_content + 2 );
-                       DBG_871X( "[%s] Peer PORT NUM = %d\n", __FUNCTION__, pwdinfo->wfd_info->peer_rtsp_ctrlport );
+                       DBG_871X( "[%s] Peer PORT NUM = %d\n", __func__, pwdinfo->wfd_info->peer_rtsp_ctrlport );
                }
        }
 #endif // CONFIG_WFD
@@ -2836,7 +2836,7 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram
        }
        else
        {
-               DBG_871X( "[%s] WPS IE not Found!!\n", __FUNCTION__ );
+               DBG_871X( "[%s] WPS IE not Found!!\n", __func__ );
                result = P2P_STATUS_FAIL_INCOMPATIBLE_PARAM;
                rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL);
        }
@@ -2879,7 +2879,7 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram
                        rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, &attr_content, &attr_contentlen);
                        if ( attr_contentlen == 1 )
                        {
-                               DBG_871X( "[%s] Status = %d\n", __FUNCTION__, attr_content );
+                               DBG_871X( "[%s] Status = %d\n", __func__, attr_content );
                                if ( attr_content == P2P_STATUS_SUCCESS )
                                {
                                        //      Do nothing.
@@ -2908,7 +2908,7 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram
                        attr_contentlen = 0;
                        if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_GO_INTENT , &attr_content, &attr_contentlen) )
                        {
-                               DBG_871X( "[%s] GO Intent = %d, tie = %d\n", __FUNCTION__, attr_content >> 1, attr_content & 0x01 );
+                               DBG_871X( "[%s] GO Intent = %d, tie = %d\n", __func__, attr_content >> 1, attr_content & 0x01 );
                                pwdinfo->peer_intent = attr_content;    //      include both intent and tie breaker values.
 
                                if ( pwdinfo->intent == ( pwdinfo->peer_intent >> 1 ) )
@@ -2961,21 +2961,21 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram
                        attr_contentlen = 0;
                        if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_OPERATING_CH, operatingch_info, &attr_contentlen))
                        {
-                               DBG_871X( "[%s] Peer's operating channel = %d\n", __FUNCTION__, operatingch_info[4] );
+                               DBG_871X( "[%s] Peer's operating channel = %d\n", __func__, operatingch_info[4] );
                                pwdinfo->peer_operating_ch = operatingch_info[4];
                        }
 
                        //      Try to get the channel list information
                        if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_CH_LIST, pwdinfo->channel_list_attr, &pwdinfo->channel_list_attr_len ) )
                        {
-                               DBG_871X( "[%s] channel list attribute found, len = %d\n", __FUNCTION__,  pwdinfo->channel_list_attr_len );
+                               DBG_871X( "[%s] channel list attribute found, len = %d\n", __func__,  pwdinfo->channel_list_attr_len );
 
                                peer_ch_num = rtw_p2p_get_peer_ch_list(pwdinfo, pwdinfo->channel_list_attr, pwdinfo->channel_list_attr_len, peer_ch_list);
                                ch_num_inclusioned = rtw_p2p_ch_inclusion(&padapter->mlmeextpriv, peer_ch_list, peer_ch_num, ch_list_inclusioned);
 
                                if ( ch_num_inclusioned == 0)
                                {
-                                       DBG_871X( "[%s] No common channel in channel list!\n", __FUNCTION__ );
+                                       DBG_871X( "[%s] No common channel in channel list!\n", __func__ );
                                        result = P2P_STATUS_FAIL_NO_COMMON_CH;
                                        rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL);
                                        break;
@@ -2989,7 +2989,7 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram
 #ifdef CONFIG_CONCURRENT_MODE
                                                if ( check_buddy_fwstate(padapter, _FW_LINKED ) )
                                                {
-                                                       DBG_871X( "[%s] desired channel NOT Found!\n", __FUNCTION__ );
+                                                       DBG_871X( "[%s] desired channel NOT Found!\n", __func__ );
                                                        result = P2P_STATUS_FAIL_NO_COMMON_CH;
                                                        rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL);
                                                        break;
@@ -3012,13 +3012,13 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram
                                                                 *      Change our operating channel as peer's for compatibility.
                                                                 */
                                                                pwdinfo->operating_channel = peer_operating_ch;
-                                                               DBG_871X( "[%s] Change op ch to %02x as peer's\n", __FUNCTION__, pwdinfo->operating_channel);
+                                                               DBG_871X( "[%s] Change op ch to %02x as peer's\n", __func__, pwdinfo->operating_channel);
                                                        }
                                                        else
                                                        {
                                                                // Take first channel of ch_list_inclusioned as operating channel
                                                                pwdinfo->operating_channel = ch_list_inclusioned[0];
-                                                               DBG_871X( "[%s] Change op ch to %02x\n", __FUNCTION__, pwdinfo->operating_channel);
+                                                               DBG_871X( "[%s] Change op ch to %02x\n", __func__, pwdinfo->operating_channel);
                                                        }
                                                }
 
@@ -3028,7 +3028,7 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram
                        }
                        else
                        {
-                               DBG_871X( "[%s] channel list attribute not found!\n", __FUNCTION__);
+                               DBG_871X( "[%s] channel list attribute not found!\n", __func__);
                        }
 
                        //      Try to get the group id information if peer is GO
@@ -3054,12 +3054,12 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram
                u8      attr_content[ 10 ] = { 0x00 };
                u32     attr_contentlen = 0;
 
-               DBG_8192C( "[%s] WFD IE Found!!\n", __FUNCTION__ );
+               DBG_8192C( "[%s] WFD IE Found!!\n", __func__ );
                rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, attr_content, &attr_contentlen);
                if ( attr_contentlen )
                {
                        pwdinfo->wfd_info->peer_rtsp_ctrlport = RTW_GET_BE16( attr_content + 2 );
-                       DBG_8192C( "[%s] Peer PORT NUM = %d\n", __FUNCTION__, pwdinfo->wfd_info->peer_rtsp_ctrlport );
+                       DBG_8192C( "[%s] Peer PORT NUM = %d\n", __func__, pwdinfo->wfd_info->peer_rtsp_ctrlport );
                }
        }
 #endif // CONFIG_WFD
@@ -3089,7 +3089,7 @@ u8 process_p2p_group_negotation_confirm( struct wifidirect_info *pwdinfo, u8 *pf
                rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, &attr_content, &attr_contentlen);
                if ( attr_contentlen == 1 )
                {
-                       DBG_871X( "[%s] Status = %d\n", __FUNCTION__, attr_content );
+                       DBG_871X( "[%s] Status = %d\n", __func__, attr_content );
                        result = attr_content;
 
                        if ( attr_content == P2P_STATUS_SUCCESS )
@@ -3144,7 +3144,7 @@ u8 process_p2p_group_negotation_confirm( struct wifidirect_info *pwdinfo, u8 *pf
                memset( groupid, 0x00, 38 );
                if ( rtw_get_p2p_attr_content( p2p_ie, p2p_ielen, P2P_ATTR_GROUP_ID, groupid, &attr_contentlen) )
                {
-                       DBG_871X( "[%s] Ssid = %s, ssidlen = %zu\n", __FUNCTION__, &groupid[ETH_ALEN], strlen(&groupid[ETH_ALEN]) );
+                       DBG_871X( "[%s] Ssid = %s, ssidlen = %zu\n", __func__, &groupid[ETH_ALEN], strlen(&groupid[ETH_ALEN]) );
                        memcpy( pwdinfo->groupid_info.go_device_addr, &groupid[0], ETH_ALEN );
                        memcpy( pwdinfo->groupid_info.ssid, &groupid[6], attr_contentlen - ETH_ALEN );
                }
@@ -3152,7 +3152,7 @@ u8 process_p2p_group_negotation_confirm( struct wifidirect_info *pwdinfo, u8 *pf
                attr_contentlen = 0;
                if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_OPERATING_CH, operatingch_info, &attr_contentlen) )
                {
-                       DBG_871X( "[%s] Peer's operating channel = %d\n", __FUNCTION__, operatingch_info[4] );
+                       DBG_871X( "[%s] Peer's operating channel = %d\n", __func__, operatingch_info[4] );
                        pwdinfo->peer_operating_ch = operatingch_info[4];
                }
 
@@ -3435,7 +3435,7 @@ _func_enter_;
                        //      If the pwdinfo->ext_listen_period = 0, that means the P2P listen state is not available on listen channel.
                        if ( pwdinfo->ext_listen_period > 0 )
                        {
-                               DBG_8192C( "[%s] P2P_STATE_IDLE, ext_listen_period = %d\n", __FUNCTION__, pwdinfo->ext_listen_period );
+                               DBG_8192C( "[%s] P2P_STATE_IDLE, ext_listen_period = %d\n", __func__, pwdinfo->ext_listen_period );
                                issue_nulldata(pbuddy_adapter, NULL, 1, 3, 500);
                                set_channel_bwmode(padapter, pwdinfo->listen_channel, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20);
                                rtw_p2p_set_state(pwdinfo, P2P_STATE_LISTEN);
@@ -3451,7 +3451,7 @@ _func_enter_;
                                rtw_p2p_chk_state(pwdinfo, P2P_STATE_RX_PROVISION_DIS_REQ) )
                {
                        //      Now, the driver is in the listen state of P2P mode.
-                       DBG_8192C( "[%s] P2P_STATE_IDLE, ext_listen_interval = %d\n", __FUNCTION__, pwdinfo->ext_listen_interval );
+                       DBG_8192C( "[%s] P2P_STATE_IDLE, ext_listen_interval = %d\n", __func__, pwdinfo->ext_listen_interval );
                        val8 = 0;
                        rtw_hal_set_hwreg(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8));
                        rtw_p2p_set_state(pwdinfo, P2P_STATE_IDLE);
@@ -3552,7 +3552,7 @@ static void ro_ch_timer_process (void *FunctionContext)
        _adapter *adapter = (_adapter *)FunctionContext;
        struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(adapter->rtw_wdev);
 
-       //printk("%s\n", __FUNCTION__);
+       //printk("%s\n", __func__);
 
 #ifdef CONFIG_CONCURRENT_MODE
        ATOMIC_SET(&pwdev_priv->ro_ch_to, 1);
@@ -4042,7 +4042,7 @@ _func_enter_;
                                if (pwrpriv->smart_ps != 0)
                                {
                                        pwrpriv->smart_ps = 0;
-                                       DBG_871X("%s(): Enter CTW, change SmartPS\n", __FUNCTION__);
+                                       DBG_871X("%s(): Enter CTW, change SmartPS\n", __func__);
                                        rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&(padapter->pwrctrlpriv.pwr_mode)));
                                }
                        }
@@ -4182,7 +4182,7 @@ static void pre_tx_scan_timer_process (void *FunctionContext)
        }
        else
        {
-               DBG_8192C( "[%s] p2p_state is %d, ignore!!\n", __FUNCTION__, rtw_p2p_state(pwdinfo) );
+               DBG_8192C( "[%s] p2p_state is %d, ignore!!\n", __func__, rtw_p2p_state(pwdinfo) );
        }
 
        _exit_critical_bh(&pmlmepriv->lock, &irqL);
@@ -4371,7 +4371,7 @@ void init_wifidirect_info( _adapter* padapter, enum P2P_ROLE role)
        rtw_p2p_findphase_ex_set(pwdinfo, P2P_FINDPHASE_EX_NONE);
 
        pwdinfo->listen_dwell = ( u8 ) (( rtw_get_current_time() % 3 ) + 1);
-       //DBG_8192C( "[%s] listen_dwell time is %d00ms\n", __FUNCTION__, pwdinfo->listen_dwell );
+       //DBG_8192C( "[%s] listen_dwell time is %d00ms\n", __func__, pwdinfo->listen_dwell );
 
        memset( &pwdinfo->tx_prov_disc_info, 0x00, sizeof( struct tx_provdisc_req_info ) );
        pwdinfo->tx_prov_disc_info.wps_config_method_request = WPS_CM_NONE;
index c0b6af0..fd759cd 100644 (file)
@@ -1307,7 +1307,7 @@ _func_enter_;
                {
                        RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,(" NULL frame\n"));
                        #ifdef DBG_RX_DROP_FRAME
-                       DBG_871X("DBG_RX_DROP_FRAME %s NULL frame\n", __FUNCTION__);
+                       DBG_871X("DBG_RX_DROP_FRAME %s NULL frame\n", __func__);
                        #endif
                        ret= _FAIL;
                        goto exit;
@@ -1319,7 +1319,7 @@ _func_enter_;
                        if (GetFrameSubType(ptr)&(BIT(4)|BIT(5)|BIT(6)))
                        {
                                #ifdef DBG_RX_DROP_FRAME
-                               DBG_871X("DBG_RX_DROP_FRAME %s drop QoS-SubType Data, including QoS NULL, excluding QoS-Data\n", __FUNCTION__);
+                               DBG_871X("DBG_RX_DROP_FRAME %s drop QoS-SubType Data, including QoS NULL, excluding QoS-Data\n", __func__);
                                #endif
                                ret= _FAIL;
                                goto exit;
@@ -1332,7 +1332,7 @@ _func_enter_;
                        RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" SA==myself\n"));
                        #ifdef DBG_RX_DROP_FRAME
                        DBG_871X("DBG_RX_DROP_FRAME %s SA="MAC_FMT", myhwaddr="MAC_FMT"\n",
-                               __FUNCTION__, MAC_ARG(pattrib->src), MAC_ARG(myhwaddr));
+                               __func__, MAC_ARG(pattrib->src), MAC_ARG(myhwaddr));
                        #endif
                        ret= _FAIL;
                        goto exit;
@@ -1349,7 +1349,7 @@ _func_enter_;
                                        pattrib->dst[4],
                                        pattrib->dst[5]));
                        #ifdef DBG_RX_DROP_FRAME
-                       DBG_871X("DBG_RX_DROP_FRAME %s DA="MAC_FMT"\n", __FUNCTION__,
+                       DBG_871X("DBG_RX_DROP_FRAME %s DA="MAC_FMT"\n", __func__,
                                        MAC_ARG(pattrib->dst));
                        #endif
 
@@ -1381,7 +1381,7 @@ _func_enter_;
 
                        #ifdef DBG_RX_DROP_FRAME
                        DBG_871X("DBG_RX_DROP_FRAME %s BSSID="MAC_FMT", mybssid="MAC_FMT"\n",
-                               __FUNCTION__, MAC_ARG(pattrib->bssid), MAC_ARG(mybssid));
+                               __func__, MAC_ARG(pattrib->bssid), MAC_ARG(mybssid));
                        #endif
 
                        ret= _FAIL;
@@ -1396,7 +1396,7 @@ _func_enter_;
                if (*psta == NULL) {
                        RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("ap2sta: can't get psta under STATION_MODE ; drop pkt\n"));
                        #ifdef DBG_RX_DROP_FRAME
-                       DBG_871X("DBG_RX_DROP_FRAME %s can't get psta under STATION_MODE ; drop pkt\n", __FUNCTION__);
+                       DBG_871X("DBG_RX_DROP_FRAME %s can't get psta under STATION_MODE ; drop pkt\n", __func__);
                        #endif
                        ret= _FAIL;
                        goto exit;
@@ -1420,7 +1420,7 @@ _func_enter_;
                if (*psta == NULL) {
                        RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("can't get psta under MP_MODE ; drop pkt\n"));
                        #ifdef DBG_RX_DROP_FRAME
-                       DBG_871X("DBG_RX_DROP_FRAME %s can't get psta under WIFI_MP_STATE ; drop pkt\n", __FUNCTION__);
+                       DBG_871X("DBG_RX_DROP_FRAME %s can't get psta under WIFI_MP_STATE ; drop pkt\n", __func__);
                        #endif
                        ret= _FAIL;
                        goto exit;
@@ -1432,7 +1432,7 @@ _func_enter_;
        {
                ret = _FAIL;
                #ifdef DBG_RX_DROP_FRAME
-               DBG_871X("DBG_RX_DROP_FRAME %s fw_state:0x%x\n", __FUNCTION__, get_fwstate(pmlmepriv));
+               DBG_871X("DBG_RX_DROP_FRAME %s fw_state:0x%x\n", __func__, get_fwstate(pmlmepriv));
                #endif
        }
 
@@ -1705,7 +1705,7 @@ sint validate_recv_mgnt_frame(PADAPTER padapter, union recv_frame *precv_frame)
 
        precv_frame = recvframe_chk_defrag(padapter, precv_frame);
        if (precv_frame == NULL) {
-               RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_,("%s: fragment packet\n",__FUNCTION__));
+               RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_,("%s: fragment packet\n",__func__));
                return _SUCCESS;
        }
 #ifdef CONFIG_INTEL_PROXIM
@@ -1836,7 +1836,7 @@ _func_enter_;
        if (res==_FAIL) {
                //RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,(" after to_fr_ds_chk; res = fail\n"));
                #ifdef DBG_RX_DROP_FRAME
-               DBG_871X("DBG_RX_DROP_FRAME %s case:%d, res:%d\n", __FUNCTION__, pattrib->to_fr_ds, res);
+               DBG_871X("DBG_RX_DROP_FRAME %s case:%d, res:%d\n", __func__, pattrib->to_fr_ds, res);
                #endif
                ret= res;
                goto exit;
@@ -2715,7 +2715,7 @@ int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_num)
        {
                preorder_ctrl->indicate_seq = seq_num;
                #ifdef DBG_RX_SEQ
-               DBG_871X("DBG_RX_SEQ %s:%d init IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__,
+               DBG_871X("DBG_RX_SEQ %s:%d init IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
                        preorder_ctrl->indicate_seq, seq_num);
                #endif
 
@@ -2731,7 +2731,7 @@ int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_num)
                //DbgPrint("CheckRxTsIndicateSeq(): Packet Drop! IndicateSeq: %d, NewSeq: %d\n", precvpriv->indicate_seq, seq_num);
 
                #ifdef DBG_RX_DROP_FRAME
-               DBG_871X("%s IndicateSeq: %d > NewSeq: %d\n", __FUNCTION__,
+               DBG_871X("%s IndicateSeq: %d > NewSeq: %d\n", __func__,
                        preorder_ctrl->indicate_seq, seq_num);
                #endif
 
@@ -2748,7 +2748,7 @@ int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_num)
        {
                preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1) & 0xFFF;
                #ifdef DBG_RX_SEQ
-               DBG_871X("DBG_RX_SEQ %s:%d SN_EQUAL IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__,
+               DBG_871X("DBG_RX_SEQ %s:%d SN_EQUAL IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
                        preorder_ctrl->indicate_seq, seq_num);
                #endif
        }
@@ -2764,7 +2764,7 @@ int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_num)
                        preorder_ctrl->indicate_seq = 0xFFF - (wsize - (seq_num + 1)) + 1;
 
                #ifdef DBG_RX_SEQ
-               DBG_871X("DBG_RX_SEQ %s:%d SN_LESS(wend, seq_num) IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__,
+               DBG_871X("DBG_RX_SEQ %s:%d SN_LESS(wend, seq_num) IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
                        preorder_ctrl->indicate_seq, seq_num);
                #endif
        }
@@ -2871,7 +2871,7 @@ int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ctrl *pre
                pattrib = &prframe->u.hdr.attrib;
                preorder_ctrl->indicate_seq = pattrib->seq_num;
                #ifdef DBG_RX_SEQ
-               DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__,
+               DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
                        preorder_ctrl->indicate_seq, pattrib->seq_num);
                #endif
        }
@@ -2897,7 +2897,7 @@ int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ctrl *pre
                        {
                                preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1) & 0xFFF;
                                #ifdef DBG_RX_SEQ
-                               DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__,
+                               DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
                                        preorder_ctrl->indicate_seq, pattrib->seq_num);
                                #endif
                        }
@@ -2993,7 +2993,7 @@ int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe)
                        }
 
                        #ifdef DBG_RX_DROP_FRAME
-                       DBG_871X("DBG_RX_DROP_FRAME %s pattrib->qos !=1\n", __FUNCTION__);
+                       DBG_871X("DBG_RX_DROP_FRAME %s pattrib->qos !=1\n", __func__);
                        #endif
 
                        return _FAIL;
@@ -3005,7 +3005,7 @@ int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe)
                        //indicate this recv_frame
                        preorder_ctrl->indicate_seq = pattrib->seq_num;
                        #ifdef DBG_RX_SEQ
-                       DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__,
+                       DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
                                preorder_ctrl->indicate_seq, pattrib->seq_num);
                        #endif
 
@@ -3013,7 +3013,7 @@ int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe)
 
                        preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1)%4096;
                        #ifdef DBG_RX_SEQ
-                       DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__,
+                       DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
                                preorder_ctrl->indicate_seq, pattrib->seq_num);
                        #endif
 
@@ -3033,7 +3033,7 @@ int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe)
                {
                        preorder_ctrl->indicate_seq = pattrib->seq_num;
                        #ifdef DBG_RX_SEQ
-                       DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__,
+                       DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
                                preorder_ctrl->indicate_seq, pattrib->seq_num);
                        #endif
 
@@ -3041,13 +3041,13 @@ int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe)
 
                        preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1)%4096;
                        #ifdef DBG_RX_SEQ
-                       DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__,
+                       DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
                                preorder_ctrl->indicate_seq, pattrib->seq_num);
                        #endif
 
                        if (retval != _SUCCESS) {
                                #ifdef DBG_RX_DROP_FRAME
-                               DBG_871X("DBG_RX_DROP_FRAME %s amsdu_to_msdu fail\n", __FUNCTION__);
+                               DBG_871X("DBG_RX_DROP_FRAME %s amsdu_to_msdu fail\n", __func__);
                                #endif
                        }
 
@@ -3075,7 +3075,7 @@ int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe)
                //return _FAIL;
 
                #ifdef DBG_RX_DROP_FRAME
-               DBG_871X("DBG_RX_DROP_FRAME %s check_indicate_seq fail\n", __FUNCTION__);
+               DBG_871X("DBG_RX_DROP_FRAME %s check_indicate_seq fail\n", __func__);
                #endif
 
                rtw_recv_indicatepkt(padapter, prframe);
@@ -3093,7 +3093,7 @@ int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe)
                //_exit_critical_ex(&ppending_recvframe_queue->lock, &irql);
                //return _FAIL;
                #ifdef DBG_RX_DROP_FRAME
-               DBG_871X("DBG_RX_DROP_FRAME %s enqueue_reorder_recvframe fail\n", __FUNCTION__);
+               DBG_871X("DBG_RX_DROP_FRAME %s enqueue_reorder_recvframe fail\n", __func__);
                #endif
                goto _err_exit;
        }
@@ -3189,7 +3189,7 @@ int process_recv_indicatepkts(_adapter *padapter, union recv_frame *prframe)
                if (recv_indicatepkt_reorder(padapter, prframe)!=_SUCCESS)// including perform A-MPDU Rx Ordering Buffer Control
                {
                        #ifdef DBG_RX_DROP_FRAME
-                       DBG_871X("DBG_RX_DROP_FRAME %s recv_indicatepkt_reorder error!\n", __FUNCTION__);
+                       DBG_871X("DBG_RX_DROP_FRAME %s recv_indicatepkt_reorder error!\n", __func__);
                        #endif
 
                        if ((padapter->bDriverStopped == false) &&
@@ -3208,7 +3208,7 @@ int process_recv_indicatepkts(_adapter *padapter, union recv_frame *prframe)
                {
                        RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("wlanhdr_to_ethhdr: drop pkt\n"));
                        #ifdef DBG_RX_DROP_FRAME
-                       DBG_871X("DBG_RX_DROP_FRAME %s wlanhdr_to_ethhdr error!\n", __FUNCTION__);
+                       DBG_871X("DBG_RX_DROP_FRAME %s wlanhdr_to_ethhdr error!\n", __func__);
                        #endif
                        return retval;
                }
@@ -3302,7 +3302,7 @@ int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
        if (prframe == NULL) {
                RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("decryptor: drop pkt\n"));
                #ifdef DBG_RX_DROP_FRAME
-               DBG_871X("DBG_RX_DROP_FRAME %s decryptor: drop pkt\n", __FUNCTION__);
+               DBG_871X("DBG_RX_DROP_FRAME %s decryptor: drop pkt\n", __func__);
                #endif
                ret = _FAIL;
                goto _recv_data_drop;
@@ -3325,7 +3325,7 @@ int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
        if (prframe==NULL)      {
                RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recvframe_chk_defrag: drop pkt\n"));
                #ifdef DBG_RX_DROP_FRAME
-               DBG_871X("DBG_RX_DROP_FRAME %s recvframe_chk_defrag: drop pkt\n", __FUNCTION__);
+               DBG_871X("DBG_RX_DROP_FRAME %s recvframe_chk_defrag: drop pkt\n", __func__);
                #endif
                goto _recv_data_drop;
        }
@@ -3334,7 +3334,7 @@ int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
        if (prframe == NULL) {
                RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("portctrl: drop pkt\n"));
                #ifdef DBG_RX_DROP_FRAME
-               DBG_871X("DBG_RX_DROP_FRAME %s portctrl: drop pkt\n", __FUNCTION__);
+               DBG_871X("DBG_RX_DROP_FRAME %s portctrl: drop pkt\n", __func__);
                #endif
                ret = _FAIL;
                goto _recv_data_drop;
@@ -3358,7 +3358,7 @@ int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
        {
                RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recv_func: process_recv_indicatepkts fail!\n"));
                #ifdef DBG_RX_DROP_FRAME
-               DBG_871X("DBG_RX_DROP_FRAME %s process_recv_indicatepkts fail!\n", __FUNCTION__);
+               DBG_871X("DBG_RX_DROP_FRAME %s process_recv_indicatepkts fail!\n", __func__);
                #endif
                rtw_free_recvframe(orig_prframe, pfree_recv_queue);//free this recv_frame
                goto _recv_data_drop;
@@ -3371,7 +3371,7 @@ int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
                {
                        RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("wlanhdr_to_ethhdr: drop pkt\n"));
                        #ifdef DBG_RX_DROP_FRAME
-                       DBG_871X("DBG_RX_DROP_FRAME %s wlanhdr_to_ethhdr: drop pkt\n", __FUNCTION__);
+                       DBG_871X("DBG_RX_DROP_FRAME %s wlanhdr_to_ethhdr: drop pkt\n", __func__);
                        #endif
                        rtw_free_recvframe(orig_prframe, pfree_recv_queue);//free this recv_frame
                        goto _recv_data_drop;
@@ -3385,7 +3385,7 @@ int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
                        if (ret != _SUCCESS)
                        {
                                #ifdef DBG_RX_DROP_FRAME
-                               DBG_871X("DBG_RX_DROP_FRAME %s rtw_recv_indicatepkt fail!\n", __FUNCTION__);
+                               DBG_871X("DBG_RX_DROP_FRAME %s rtw_recv_indicatepkt fail!\n", __func__);
                                #endif
                                goto _recv_data_drop;
                        }
@@ -3395,7 +3395,7 @@ int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
                        RT_TRACE(_module_rtl871x_recv_c_, _drv_alert_, ("@@@@  recv_func: rtw_free_recvframe\n" ));
                        RT_TRACE(_module_rtl871x_recv_c_, _drv_debug_, ("recv_func:bDriverStopped(%d) OR bSurpriseRemoved(%d)", padapter->bDriverStopped, padapter->bSurpriseRemoved));
                        #ifdef DBG_RX_DROP_FRAME
-                       DBG_871X("DBG_RX_DROP_FRAME %s ecv_func:bDriverStopped(%d) OR bSurpriseRemoved(%d)\n", __FUNCTION__,
+                       DBG_871X("DBG_RX_DROP_FRAME %s ecv_func:bDriverStopped(%d) OR bSurpriseRemoved(%d)\n", __func__,
                                padapter->bDriverStopped, padapter->bSurpriseRemoved);
                        #endif
                        ret = _FAIL;
@@ -3410,7 +3410,7 @@ int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
                if (ret != _SUCCESS)
                {
                        #ifdef DBG_RX_DROP_FRAME
-                       DBG_871X("DBG_RX_DROP_FRAME %s amsdu_to_msdu fail\n", __FUNCTION__);
+                       DBG_871X("DBG_RX_DROP_FRAME %s amsdu_to_msdu fail\n", __func__);
                        #endif
                        rtw_free_recvframe(orig_prframe, pfree_recv_queue);
                        goto _recv_data_drop;
@@ -3419,7 +3419,7 @@ int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
        else
        {
                #ifdef DBG_RX_DROP_FRAME
-               DBG_871X("DBG_RX_DROP_FRAME %s what is this condition??\n", __FUNCTION__);
+               DBG_871X("DBG_RX_DROP_FRAME %s what is this condition??\n", __func__);
                #endif
                goto _recv_data_drop;
        }
@@ -3575,7 +3575,7 @@ void rtw_signal_stat_timer_hdl(RTW_TIMER_HDL_ARGS) {
                        DBG_871X("%s signal_strength:%3u, rssi:%3d, signal_qual:%3u"
                                ", num_signal_strength:%u, num_signal_qual:%u"
                                "\n"
-                               , __FUNCTION__
+                               , __func__
                                , recvpriv->signal_strength
                                , recvpriv->rssi
                                , recvpriv->signal_qual
index aa874ad..3b2701c 100644 (file)
@@ -795,7 +795,7 @@ _func_enter_;
                                if (psecuritypriv->binstallGrpkey==false)
                                {
                                        res=_FAIL;
-                                       DBG_8192C("%s:rx bc/mc packets,but didn't install group key!!!!!!!!!!\n",__FUNCTION__);
+                                       DBG_8192C("%s:rx bc/mc packets,but didn't install group key!!!!!!!!!!\n",__func__);
                                        goto exit;
                                }
                                //DBG_871X("rx bc/mc packets, to perform sw rtw_tkip_decrypt\n");
@@ -1574,7 +1574,7 @@ _func_enter_;
                                ptdls_sta=rtw_get_stainfo(&padapter->stapriv ,&pattrib->dst[0] );
                                if ((ptdls_sta != NULL) && (ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE) )
                                {
-                                       DBG_871X("[%s] for tdls link\n", __FUNCTION__);
+                                       DBG_871X("[%s] for tdls link\n", __func__);
                                        prwskey=&ptdls_sta->tpk.tk[0];
                                }
                        }
@@ -1917,7 +1917,7 @@ _func_enter_;
                                if (psecuritypriv->binstallGrpkey==false)
                                {
                                        res=_FAIL;
-                                       DBG_8192C("%s:rx bc/mc packets,but didn't install group key!!!!!!!!!!\n",__FUNCTION__);
+                                       DBG_8192C("%s:rx bc/mc packets,but didn't install group key!!!!!!!!!!\n",__func__);
                                        goto exit;
                                }
                                prwskey = psecuritypriv->dot118021XGrpKey[prxattrib->key_index].skey;
@@ -2817,7 +2817,7 @@ int tdls_verify_mic(u8 *kck, u8 trans_seq,
        }
 
        //Invalid MIC
-       DBG_871X( "[%s] Invalid MIC\n", __FUNCTION__);
+       DBG_871X( "[%s] Invalid MIC\n", __func__);
        return 0;
 
 }
index a4854dd..4b3f59f 100644 (file)
@@ -66,10 +66,10 @@ u8 sreset_get_wifi_status(_adapter *padapter)
 
        if (WIFI_STATUS_SUCCESS !=psrtpriv->Wifi_Error_Status)
        {
-               DBG_8192C("==>%s error_status(0x%x)\n",__FUNCTION__,psrtpriv->Wifi_Error_Status);
+               DBG_8192C("==>%s error_status(0x%x)\n",__func__,psrtpriv->Wifi_Error_Status);
                status = (psrtpriv->Wifi_Error_Status &( ~(USB_READ_PORT_FAIL|USB_WRITE_PORT_FAIL)));
        }
-       DBG_8192C("==> %s wifi_status(0x%x)\n",__FUNCTION__,status);
+       DBG_8192C("==> %s wifi_status(0x%x)\n",__func__,status);
 
        //status restore
        psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS;
index 3785765..6e33ca4 100644 (file)
@@ -345,7 +345,7 @@ _func_enter_;
 
                        preorder_ctrl->indicate_seq = 0xffff;
                        #ifdef DBG_RX_SEQ
-                       DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d\n", __FUNCTION__, __LINE__,
+                       DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d\n", __func__, __LINE__,
                                preorder_ctrl->indicate_seq);
                        #endif
                        preorder_ctrl->wend_b= 0xffff;
@@ -498,7 +498,7 @@ _func_enter_;
                _exit_critical_bh(&ppending_recvframe_queue->lock, &irqL);
 
        }
-       DBG_871X("%s\n",__FUNCTION__);
+       DBG_871X("%s\n",__func__);
        if (!(psta->state & WIFI_AP_STATE))
                rtw_hal_set_odm_var(padapter, HAL_ODM_STA_INFO, psta, false);
 
index b9169b5..9dd3048 100644 (file)
@@ -427,12 +427,12 @@ void rtw_tdls_process_wfd_ie(struct tdls_info *ptdlsinfo, u8 *ptr, u8 length)
                u32     attr_contentlen = 0;
                int     i;
 
-               DBG_871X( "[%s] WFD IE Found!!\n", __FUNCTION__ );
+               DBG_871X( "[%s] WFD IE Found!!\n", __func__ );
                rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, attr_content, &attr_contentlen);
                if ( attr_contentlen )
                {
                        ptdlsinfo->wfd_info->peer_rtsp_ctrlport = RTW_GET_BE16( attr_content + 2 );
-                       DBG_871X( "[%s] Peer PORT NUM = %d\n", __FUNCTION__, ptdlsinfo->wfd_info->peer_rtsp_ctrlport );
+                       DBG_871X( "[%s] Peer PORT NUM = %d\n", __func__, ptdlsinfo->wfd_info->peer_rtsp_ctrlport );
                }
 
                memset( attr_content, 0x00, 10);
@@ -441,7 +441,7 @@ void rtw_tdls_process_wfd_ie(struct tdls_info *ptdlsinfo, u8 *ptr, u8 length)
                if ( attr_contentlen )
                {
                        memcpy(ptdlsinfo->wfd_info->peer_ip_address, ( attr_content + 1 ), 4);
-                       DBG_871X( "[%s] Peer IP = %02u.%02u.%02u.%02u\n", __FUNCTION__,
+                       DBG_871X( "[%s] Peer IP = %02u.%02u.%02u.%02u\n", __func__,
                                ptdlsinfo->wfd_info->peer_ip_address[0], ptdlsinfo->wfd_info->peer_ip_address[1],
                                ptdlsinfo->wfd_info->peer_ip_address[2], ptdlsinfo->wfd_info->peer_ip_address[3]
                                );
@@ -458,7 +458,7 @@ void issue_tunneled_probe_req(_adapter *padapter)
        struct xmit_priv                        *pxmitpriv = &(padapter->xmitpriv);
        u8 baddr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 
-       DBG_871X("[%s]\n", __FUNCTION__);
+       DBG_871X("[%s]\n", __func__);
 
        if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)
        {
@@ -501,7 +501,7 @@ void issue_tunneled_probe_rsp(_adapter *padapter, union recv_frame *precv_frame)
        struct xmit_priv                        *pxmitpriv = &(padapter->xmitpriv);
        struct rx_pkt_attrib    *rx_pkt_pattrib = &precv_frame->u.hdr.attrib;
 
-       DBG_871X("[%s]\n", __FUNCTION__);
+       DBG_871X("[%s]\n", __func__);
 
        if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)
        {
@@ -1345,7 +1345,7 @@ sint On_TDLS_Setup_Rsp(_adapter *adapter, union recv_frame *precv_frame)
 
        if (stat_code!=0)
        {
-               DBG_871X( "[%s] status_code = %d, free_tdls_sta\n", __FUNCTION__, stat_code );
+               DBG_871X( "[%s] status_code = %d, free_tdls_sta\n", __func__, stat_code );
                free_tdls_sta(adapter, ptdls_sta);
                return _FAIL;
        }
@@ -1510,7 +1510,7 @@ sint On_TDLS_Setup_Cfm(_adapter *adapter, union recv_frame *precv_frame)
        memcpy(&stat_code, ptr+2, 2);
 
        if (stat_code!=0) {
-               DBG_871X( "[%s] stat_code = %d\n, free_tdls_sta", __FUNCTION__, stat_code );
+               DBG_871X( "[%s] stat_code = %d\n, free_tdls_sta", __func__, stat_code );
                free_tdls_sta(adapter, ptdls_sta);
                return _FAIL;
        }
@@ -2161,7 +2161,7 @@ void rtw_build_tdls_setup_rsp_ies(_adapter * padapter, struct xmit_frame * pxmit
 
        if (ptdls_sta == NULL )
        {
-               DBG_871X("[%s] %d\n", __FUNCTION__, __LINE__);
+               DBG_871X("[%s] %d\n", __func__, __LINE__);
                return;
        }
 
index 3d6eb32..7aeb74d 100644 (file)
@@ -797,18 +797,18 @@ int WFD_info_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs        pIE)
                u8      attr_content[ 10 ] = { 0x00 };
                u32     attr_contentlen = 0;
 
-               DBG_871X( "[%s] Found WFD IE\n", __FUNCTION__ );
+               DBG_871X( "[%s] Found WFD IE\n", __func__ );
                rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, attr_content, &attr_contentlen);
                if ( attr_contentlen )
                {
                        pwdinfo->wfd_info->peer_rtsp_ctrlport = RTW_GET_BE16( attr_content + 2 );
-                       DBG_8192C( "[%s] Peer PORT NUM = %d\n", __FUNCTION__, pwdinfo->wfd_info->peer_rtsp_ctrlport );
+                       DBG_8192C( "[%s] Peer PORT NUM = %d\n", __func__, pwdinfo->wfd_info->peer_rtsp_ctrlport );
                        return( true );
                }
        }
        else
        {
-               DBG_871X( "[%s] NO WFD IE\n", __FUNCTION__ );
+               DBG_871X( "[%s] NO WFD IE\n", __func__ );
 
        }
        return( _FAIL );
@@ -1188,7 +1188,7 @@ void HTOnAssocRsp(_adapter *padapter)
        struct mlme_ext_priv    *pmlmeext = &padapter->mlmeextpriv;
        struct mlme_ext_info    *pmlmeinfo = &(pmlmeext->mlmext_info);
 
-       DBG_871X("%s\n", __FUNCTION__);
+       DBG_871X("%s\n", __func__);
 
        if ((pmlmeinfo->HT_info_enable) && (pmlmeinfo->HT_caps_enable))
        {
@@ -2210,7 +2210,7 @@ void process_addba_req(_adapter *padapter, u8 *paddba_req, u8 *addr)
                #ifdef CONFIG_UPDATE_INDICATE_SEQ_WHILE_PROCESS_ADDBA_REQ
                preorder_ctrl->indicate_seq = start_seq;
                #ifdef DBG_RX_SEQ
-               DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, start_seq: %d\n", __FUNCTION__, __LINE__,
+               DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, start_seq: %d\n", __func__, __LINE__,
                        preorder_ctrl->indicate_seq, start_seq);
                #endif
                #else
@@ -2257,13 +2257,13 @@ int rtw_handle_dualmac(_adapter *adapter, bool init)
        if (init) {
                if (pbuddy_padapter == NULL) {
                        pbuddy_padapter = adapter;
-                       DBG_871X("%s(): pbuddy_padapter == NULL, Set pbuddy_padapter\n",__FUNCTION__);
+                       DBG_871X("%s(): pbuddy_padapter == NULL, Set pbuddy_padapter\n",__func__);
                } else {
                        adapter->pbuddy_adapter = pbuddy_padapter;
                        pbuddy_padapter->pbuddy_adapter = adapter;
                        // clear global value
                        pbuddy_padapter = NULL;
-                       DBG_871X("%s(): pbuddy_padapter exist, Exchange Information\n",__FUNCTION__);
+                       DBG_871X("%s(): pbuddy_padapter exist, Exchange Information\n",__func__);
                }
 #ifdef CONFIG_DUALMAC_CONCURRENT
                if (dvobj->InterfaceNumber == 0) {
@@ -2271,13 +2271,13 @@ int rtw_handle_dualmac(_adapter *adapter, bool init)
                        adapter->isprimary = true;
                        adapter->adapter_type = PRIMARY_ADAPTER;
                        adapter->iface_type = IFACE_PORT0;
-                       DBG_871X("%s(): PRIMARY_ADAPTER\n",__FUNCTION__);
+                       DBG_871X("%s(): PRIMARY_ADAPTER\n",__func__);
                } else {
                        //set adapter_type/iface type
                        adapter->isprimary = false;
                        adapter->adapter_type = SECONDARY_ADAPTER;
                        adapter->iface_type = IFACE_PORT1;
-                       DBG_871X("%s(): SECONDARY_ADAPTER\n",__FUNCTION__);
+                       DBG_871X("%s(): SECONDARY_ADAPTER\n",__func__);
                }
 #endif
        } else {
index cd86c8a..317b8b3 100644 (file)
@@ -677,7 +677,7 @@ static s32 update_attrib(_adapter *padapter, struct sk_buff *pkt, struct pkt_att
                if (psta == NULL)       { // if we cannot get psta => drrp the pkt
                        RT_TRACE(_module_rtl871x_xmit_c_, _drv_alert_, ("\nupdate_attrib => get sta_info fail, ra:" MAC_FMT"\n", MAC_ARG(pattrib->ra)));
                        #ifdef DBG_TX_DROP_FRAME
-                       DBG_871X("DBG_TX_DROP_FRAME %s get sta_info fail, ra:" MAC_FMT"\n", __FUNCTION__, MAC_ARG(pattrib->ra));
+                       DBG_871X("DBG_TX_DROP_FRAME %s get sta_info fail, ra:" MAC_FMT"\n", __func__, MAC_ARG(pattrib->ra));
                        #endif
                        res =_FAIL;
                        goto exit;
@@ -692,7 +692,7 @@ static s32 update_attrib(_adapter *padapter, struct sk_buff *pkt, struct pkt_att
        if (psta)
        {
                pattrib->mac_id = psta->mac_id;
-               //DBG_8192C("%s ==> mac_id(%d)\n",__FUNCTION__,pattrib->mac_id );
+               //DBG_8192C("%s ==> mac_id(%d)\n",__func__,pattrib->mac_id );
                pattrib->psta = psta;
        }
        else
@@ -700,7 +700,7 @@ static s32 update_attrib(_adapter *padapter, struct sk_buff *pkt, struct pkt_att
                // if we cannot get psta => drop the pkt
                RT_TRACE(_module_rtl871x_xmit_c_, _drv_alert_, ("\nupdate_attrib => get sta_info fail, ra:" MAC_FMT "\n", MAC_ARG(pattrib->ra)));
                #ifdef DBG_TX_DROP_FRAME
-               DBG_871X("DBG_TX_DROP_FRAME %s get sta_info fail, ra:" MAC_FMT"\n", __FUNCTION__, MAC_ARG(pattrib->ra));
+               DBG_871X("DBG_TX_DROP_FRAME %s get sta_info fail, ra:" MAC_FMT"\n", __func__, MAC_ARG(pattrib->ra));
                #endif
                res = _FAIL;
                goto exit;
@@ -744,7 +744,7 @@ static s32 update_attrib(_adapter *padapter, struct sk_buff *pkt, struct pkt_att
                {
                        RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("\npsta->ieee8021x_blocked == true,  pattrib->ether_type(%.4x) != 0x888e\n",pattrib->ether_type));
                        #ifdef DBG_TX_DROP_FRAME
-                       DBG_871X("DBG_TX_DROP_FRAME %s psta->ieee8021x_blocked == true,  pattrib->ether_type(%04x) != 0x888e\n", __FUNCTION__,pattrib->ether_type);
+                       DBG_871X("DBG_TX_DROP_FRAME %s psta->ieee8021x_blocked == true,  pattrib->ether_type(%04x) != 0x888e\n", __func__,pattrib->ether_type);
                        #endif
                        res = _FAIL;
                        goto exit;
@@ -796,7 +796,7 @@ static s32 update_attrib(_adapter *padapter, struct sk_buff *pkt, struct pkt_att
                        {
                                RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("\npadapter->securitypriv.busetkipkey(%d)==_FAIL drop packet\n", padapter->securitypriv.busetkipkey));
                                #ifdef DBG_TX_DROP_FRAME
-                               DBG_871X("DBG_TX_DROP_FRAME %s padapter->securitypriv.busetkipkey(%d)==_FAIL drop packet\n", __FUNCTION__, padapter->securitypriv.busetkipkey);
+                               DBG_871X("DBG_TX_DROP_FRAME %s padapter->securitypriv.busetkipkey(%d)==_FAIL drop packet\n", __func__, padapter->securitypriv.busetkipkey);
                                #endif
                                res =_FAIL;
                                goto exit;
@@ -1621,7 +1621,7 @@ _func_enter_;
                return _FAIL;
 
        if (pxmitframe->buf_addr == NULL) {
-               DBG_8192C("==> %s buf_addr==NULL\n",__FUNCTION__);
+               DBG_8192C("==> %s buf_addr==NULL\n",__func__);
                return _FAIL;
        }
 
@@ -1750,7 +1750,7 @@ _func_enter_;
 
                        break;
                } else {
-                       RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("%s: There're still something in packet!\n", __FUNCTION__));
+                       RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("%s: There're still something in packet!\n", __func__));
                }
 
                addr = (SIZE_PTR)(pframe);
@@ -2666,7 +2666,7 @@ int rtw_br_client_tx(_adapter *padapter, struct sk_buff **pskb)
                                }
 
                                if (skb_is_nonlinear(skb))
-                                       DEBUG_ERR("%s(): skb_is_nonlinear!!\n", __FUNCTION__);
+                                       DEBUG_ERR("%s(): skb_is_nonlinear!!\n", __func__);
 
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18))
@@ -2690,7 +2690,7 @@ int rtw_br_client_tx(_adapter *padapter, struct sk_buff **pskb)
 
                                        }
                                        // we just print warning message and let it go
-                                       //DEBUG_WARN("%s()-%d: nat25_db_handle INSERT Warning!\n", __FUNCTION__, __LINE__);
+                                       //DEBUG_WARN("%s()-%d: nat25_db_handle INSERT Warning!\n", __func__, __LINE__);
                                        //return -1; // return -1 will cause system crash on 2011/08/30!
                                        return 0;
                                }
@@ -2801,7 +2801,7 @@ s32 rtw_xmit(_adapter *padapter, struct sk_buff **ppkt)
        if (pxmitframe == NULL) {
                RT_TRACE(_module_xmit_osdep_c_, _drv_err_, ("rtw_xmit: no more pxmitframe\n"));
                //#ifdef DBG_TX_DROP_FRAME
-               DBG_871X("DBG_TX_DROP_FRAME %s no more pxmitframe\n", __FUNCTION__);
+               DBG_871X("DBG_TX_DROP_FRAME %s no more pxmitframe\n", __func__);
                //#endif
                return -1;
        }
@@ -2843,7 +2843,7 @@ s32 rtw_xmit(_adapter *padapter, struct sk_buff **ppkt)
        if (res == _FAIL) {
                RT_TRACE(_module_xmit_osdep_c_, _drv_err_, ("rtw_xmit: update attrib fail\n"));
                #ifdef DBG_TX_DROP_FRAME
-               DBG_871X("DBG_TX_DROP_FRAME %s update attrib fail\n", __FUNCTION__);
+               DBG_871X("DBG_TX_DROP_FRAME %s update attrib fail\n", __func__);
                #endif
                rtw_free_xmitframe(pxmitpriv, pxmitframe);
                return -1;
@@ -3534,7 +3534,7 @@ struct xmit_buf* dequeue_pending_xmitbuf_under_survey(
                        if (pxmitframe)
                                type = GetFrameSubType(pxmitbuf->pbuf + TXDESC_SIZE + pxmitframe->pkt_offset * PACKET_OFFSET_SZ);
                        else
-                               DBG_871X("%s, !!!ERROR!!! For USB, TODO ITEM\n", __FUNCTION__);
+                               DBG_871X("%s, !!!ERROR!!! For USB, TODO ITEM\n", __func__);
 
                        if ((type == WIFI_PROBEREQ) ||
                            (type == WIFI_DATA_NULL) ||
index eb28333..5db8af2 100644 (file)
@@ -612,7 +612,7 @@ u8 odm_AntDivBeforeLink8192C(PADAPTER Adapter )
 
                //PHY_SetBBReg(Adapter, rFPGA0_XA_RFInterfaceOE, 0x300, pDM_SWAT_Table->CurAntenna);
                rtw_antenna_select_cmd(Adapter, pDM_SWAT_Table->CurAntenna, false);
-               //DBG_8192C("%s change antenna to ANT_( %s ).....\n",__FUNCTION__, (pDM_SWAT_Table->CurAntenna==Antenna_A)?"A":"B");
+               //DBG_8192C("%s change antenna to ANT_( %s ).....\n",__func__, (pDM_SWAT_Table->CurAntenna==Antenna_A)?"A":"B");
                return true;
        }
        else
index 38439f3..af9df89 100644 (file)
@@ -204,7 +204,7 @@ void rtw_hal_enable_interrupt(_adapter *padapter)
        if (padapter->HalFunc.enable_interrupt)
                padapter->HalFunc.enable_interrupt(padapter);
        else
-               DBG_871X("%s: HalFunc.enable_interrupt is NULL!\n", __FUNCTION__);
+               DBG_871X("%s: HalFunc.enable_interrupt is NULL!\n", __func__);
 
 }
 void rtw_hal_disable_interrupt(_adapter *padapter)
@@ -212,7 +212,7 @@ void rtw_hal_disable_interrupt(_adapter *padapter)
        if (padapter->HalFunc.disable_interrupt)
                padapter->HalFunc.disable_interrupt(padapter);
        else
-               DBG_871X("%s: HalFunc.disable_interrupt is NULL!\n", __FUNCTION__);
+               DBG_871X("%s: HalFunc.disable_interrupt is NULL!\n", __func__);
 
 }
 
@@ -223,7 +223,7 @@ u32 rtw_hal_inirp_init(_adapter *padapter)
        if (padapter->HalFunc.inirp_init)
                rst = padapter->HalFunc.inirp_init(padapter);
        else
-               DBG_871X(" %s HalFunc.inirp_init is NULL!!!\n",__FUNCTION__);
+               DBG_871X(" %s HalFunc.inirp_init is NULL!!!\n",__func__);
        return rst;
 }
 
index b9d7ca0..a1c83b1 100644 (file)
--- a/hal/odm.c
+++ b/hal/odm.c
@@ -2802,7 +2802,7 @@ u4Byte ODM_Get_Rate_Bitmap(
 
        }
 
-       //printk("%s ==> rssi_level:0x%02x, WirelessMode:0x%02x, rate_bitmap:0x%08x\n",__FUNCTION__,rssi_level,WirelessMode,rate_bitmap);
+       //printk("%s ==> rssi_level:0x%02x, WirelessMode:0x%02x, rate_bitmap:0x%08x\n",__func__,rssi_level,WirelessMode,rate_bitmap);
        ODM_RT_TRACE(pDM_Odm, ODM_COMP_RA_MASK, ODM_DBG_LOUD, (" ==> rssi_level:0x%02x, WirelessMode:0x%02x, rate_bitmap:0x%08x\n",rssi_level,WirelessMode,rate_bitmap));
 
        return rate_bitmap;
@@ -2973,7 +2973,7 @@ odm_RefreshRateAdaptiveMaskCE(
                return;
        }
 
-       //printk("==> %s\n",__FUNCTION__);
+       //printk("==> %s\n",__func__);
 
        for (i=0; i<ODM_ASSOCIATE_ENTRY_NUM; i++) {
                PSTA_INFO_T pstat = pDM_Odm->pODM_StaInfo[i];
@@ -3063,7 +3063,7 @@ ODM_RAStateCheck(
                RATRState = DM_RATR_STA_MIDDLE;
        else
                RATRState = DM_RATR_STA_LOW;
-       //printk("==>%s,RATRState:0x%02x ,RSSI:%d\n",__FUNCTION__,RATRState,RSSI);
+       //printk("==>%s,RATRState:0x%02x ,RSSI:%d\n",__func__,RATRState,RSSI);
 
        if ( *pRATRState!=RATRState || bForceUpdate)
        {
@@ -3448,7 +3448,7 @@ odm_DynamicTxPower_92C(
        if (Adapter->proximity.proxim_on== true) {
                struct proximity_priv *prox_priv=Adapter->proximity.proximity_priv;
                // Intel set fixed tx power
-               printk("\n %s  Adapter->proximity.proxim_on=%d prox_priv->proxim_modeinfo->power_output=%d\n",__FUNCTION__,Adapter->proximity.proxim_on,prox_priv->proxim_modeinfo->power_output);
+               printk("\n %s  Adapter->proximity.proxim_on=%d prox_priv->proxim_modeinfo->power_output=%d\n",__func__,Adapter->proximity.proxim_on,prox_priv->proxim_modeinfo->power_output);
                if (prox_priv!=NULL) {
                        if (prox_priv->proxim_modeinfo->power_output> 0)
                        {
@@ -4145,7 +4145,7 @@ odm_RSSIMonitorCheckCE(
                                                tmpEntryMaxPWDB = psta->rssi_stat.UndecoratedSmoothedPWDB;
 
                                        if (psta->rssi_stat.UndecoratedSmoothedPWDB != (-1)) {
-                                               //printk("%s==> mac_id(%d),rssi(%d)\n",__FUNCTION__,psta->mac_id,psta->rssi_stat.UndecoratedSmoothedPWDB);
+                                               //printk("%s==> mac_id(%d),rssi(%d)\n",__func__,psta->mac_id,psta->rssi_stat.UndecoratedSmoothedPWDB);
                                                #if (RTL8192D_SUPPORT==1)
                                                PWDB_rssi[sta_cnt++] = (psta->mac_id | (psta->rssi_stat.UndecoratedSmoothedPWDB<<16) | ((Adapter->stapriv.asoc_sta_count+1) << 8));
                                                #else
@@ -4161,7 +4161,7 @@ odm_RSSIMonitorCheckCE(
                _exit_critical_bh(&pstapriv->sta_hash_lock, &irqL);
                #endif
 
-               //printk("%s==> sta_cnt(%d)\n",__FUNCTION__,sta_cnt);
+               //printk("%s==> sta_cnt(%d)\n",__func__,sta_cnt);
 
                for (i=0; i< sta_cnt; i++)
                {
@@ -7298,7 +7298,7 @@ odm_IotEngine(
                        }
 #if ((DM_ODM_SUPPORT_TYPE==ODM_ADSL)||((DM_ODM_SUPPORT_TYPE==ODM_AP)&&(defined WMM_VIBE_PRI)))
                        if (priv->pshare->iot_mode_VO_exist) {
-                               //printk("[%s %d] BE_pkt_count=%d\n", __FUNCTION__, __LINE__, priv->pshare->phw->BE_pkt_count);
+                               //printk("[%s %d] BE_pkt_count=%d\n", __func__, __LINE__, priv->pshare->phw->BE_pkt_count);
                                if (!priv->pshare->iot_mode_BE_exist && (priv->pshare->phw->BE_pkt_count > 250)) {
                                        priv->pshare->iot_mode_BE_exist++;
                                        switch_turbo++;
index f28b6fc..eb86013 100755 (executable)
@@ -177,7 +177,7 @@ u8 rtl8192c_set_FwSelectSuspend_cmd(_adapter *padapter ,u8 bfwpoll, u16 period)
 {
        u8      res=_SUCCESS;
        struct H2C_SS_RFOFF_PARAM param;
-       DBG_8192C("==>%s bfwpoll(%x)\n",__FUNCTION__,bfwpoll);
+       DBG_8192C("==>%s bfwpoll(%x)\n",__func__,bfwpoll);
        param.gpio_period = period;//Polling GPIO_11 period time
        param.ROFOn = (true == bfwpoll)?1:0;
        FillH2CCmd(padapter, SELECTIVE_SUSPEND_ROF_CMD, sizeof(param), (u8*)(&param));
@@ -275,7 +275,7 @@ void rtl8723a_set_FwPwrMode_cmd(PADAPTER padapter, u8 Mode)
 _func_enter_;
 
        DBG_871X_LEVEL(_drv_info_, "%s: Mode=%d SmartPS=%d UAPSD=%d BcnMode=0x%02x\n",
-                      __FUNCTION__, Mode, pwrpriv->smart_ps,
+                      __func__, Mode, pwrpriv->smart_ps,
                       padapter->registrypriv.uapsd_enable,
                       pwrpriv->bcn_ant_mode);
 
@@ -301,7 +301,7 @@ void ConstructBeacon(_adapter *padapter, u8 *pframe, u32 *pLength)
        u8      bc_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 
 
-       //DBG_871X("%s\n", __FUNCTION__);
+       //DBG_871X("%s\n", __func__);
 
        pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
 
@@ -388,7 +388,7 @@ _ConstructBeacon:
 
        *pLength = pktlen;
 
-       //DBG_871X("%s bcn_sz=%d\n", __FUNCTION__, pktlen);
+       //DBG_871X("%s bcn_sz=%d\n", __func__, pktlen);
 
 }
 
@@ -400,7 +400,7 @@ void ConstructPSPoll(_adapter *padapter, u8 *pframe, u32 *pLength)
        struct mlme_ext_priv    *pmlmeext = &(padapter->mlmeextpriv);
        struct mlme_ext_info    *pmlmeinfo = &(pmlmeext->mlmext_info);
 
-       //DBG_871X("%s\n", __FUNCTION__);
+       //DBG_871X("%s\n", __func__);
 
        pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
 
@@ -441,7 +441,7 @@ void ConstructNullFunctionData(
        struct mlme_ext_info    *pmlmeinfo = &(pmlmeext->mlmext_info);
 
 
-       //DBG_871X("%s:%d\n", __FUNCTION__, bForcePowerSave);
+       //DBG_871X("%s:%d\n", __func__, bForcePowerSave);
 
        pwlanhdr = (struct rtw_ieee80211_hdr*)pframe;
 
@@ -506,7 +506,7 @@ void ConstructProbeRsp(_adapter *padapter, u8 *pframe, u32 *pLength, u8 *StaAddr
        WLAN_BSSID_EX           *cur_network = &(pmlmeinfo->network);
 
 
-       //DBG_871X("%s\n", __FUNCTION__);
+       //DBG_871X("%s\n", __func__);
 
        pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
 
@@ -582,11 +582,11 @@ static void SetFwRsvdPagePkt(PADAPTER padapter, bool bDLFinished)
        struct rsvdpage_loc     RsvdPageLoc;
 
 
-       DBG_871X("%s\n", __FUNCTION__);
+       DBG_871X("%s\n", __func__);
 
        ReservedPagePacket = (u8*)rtw_zmalloc(1000);
        if (ReservedPagePacket == NULL) {
-               DBG_871X("%s: alloc ReservedPagePacket fail!\n", __FUNCTION__);
+               DBG_871X("%s: alloc ReservedPagePacket fail!\n", __func__);
                return;
        }
 
@@ -693,7 +693,7 @@ static void SetFwRsvdPagePkt(PADAPTER padapter, bool bDLFinished)
 
        rtw_hal_mgnt_xmit(padapter, pmgntframe);
 
-       DBG_871X("%s: Set RSVD page location to Fw\n", __FUNCTION__);
+       DBG_871X("%s: Set RSVD page location to Fw\n", __func__);
        FillH2CCmd(padapter, RSVD_PAGE_EID, sizeof(RsvdPageLoc), (u8*)&RsvdPageLoc);
 
 exit:
@@ -709,7 +709,7 @@ void rtl8723a_set_FwJoinBssReport_cmd(PADAPTER padapter, u8 mstatus)
 
 _func_enter_;
 
-       DBG_871X("%s mstatus(%x)\n", __FUNCTION__,mstatus);
+       DBG_871X("%s mstatus(%x)\n", __func__,mstatus);
 
        if (mstatus == 1)
        {
@@ -794,11 +794,11 @@ static void SetFwRsvdPagePkt_BTCoex(PADAPTER padapter)
        u16     BufIndex;
        u32     TotalPacketLen;
 
-       DBG_871X("+%s\n", __FUNCTION__);
+       DBG_871X("+%s\n", __func__);
 
        ReservedPagePacket = (u8*)rtw_zmalloc(1024);
        if (ReservedPagePacket == NULL) {
-               DBG_871X("%s: alloc ReservedPagePacket fail!\n", __FUNCTION__);
+               DBG_871X("%s: alloc ReservedPagePacket fail!\n", __func__);
                return;
        }
 
@@ -866,7 +866,7 @@ static void SetFwRsvdPagePkt_BTCoex(PADAPTER padapter)
 
        rtw_hal_mgnt_xmit(padapter, pmgntframe);
 
-       DBG_8192C("%s: Set RSVD page location to Fw\n", __FUNCTION__);
+       DBG_8192C("%s: Set RSVD page location to Fw\n", __func__);
        FillH2CCmd(padapter, RSVD_PAGE_EID, sizeof(RsvdPageLoc), (u8*)&RsvdPageLoc);
 
 exit:
@@ -879,7 +879,7 @@ void rtl8723a_set_BTCoex_AP_mode_FwRsvdPkt_cmd(PADAPTER padapter)
        u8 bRecover = false;
 
 
-       DBG_8192C("+%s\n", __FUNCTION__);
+       DBG_8192C("+%s\n", __func__);
 
        pHalData = GET_HAL_DATA(padapter);
 
index ee93421..224bd3b 100755 (executable)
@@ -228,10 +228,10 @@ static s32 _FWFreeToGo(PADAPTER padapter)
        } while (counter++ < POLLING_READY_TIMEOUT_COUNT);
 
        if (counter >= POLLING_READY_TIMEOUT_COUNT) {
-               RT_TRACE(_module_hal_init_c_, _drv_err_, ("%s: chksum report fail! REG_MCUFWDL:0x%08x\n", __FUNCTION__, value32));
+               RT_TRACE(_module_hal_init_c_, _drv_err_, ("%s: chksum report fail! REG_MCUFWDL:0x%08x\n", __func__, value32));
                return _FAIL;
        }
-       RT_TRACE(_module_hal_init_c_, _drv_info_, ("%s: Checksum report OK! REG_MCUFWDL:0x%08x\n", __FUNCTION__, value32));
+       RT_TRACE(_module_hal_init_c_, _drv_info_, ("%s: Checksum report OK! REG_MCUFWDL:0x%08x\n", __func__, value32));
 
        value32 = rtw_read32(padapter, REG_MCUFWDL);
        value32 |= MCUFWDL_RDY;
@@ -243,13 +243,13 @@ static s32 _FWFreeToGo(PADAPTER padapter)
        do {
                value32 = rtw_read32(padapter, REG_MCUFWDL);
                if (value32 & WINTINI_RDY) {
-                       RT_TRACE(_module_hal_init_c_, _drv_info_, ("%s: Polling FW ready success!! REG_MCUFWDL:0x%08x\n", __FUNCTION__, value32));
+                       RT_TRACE(_module_hal_init_c_, _drv_info_, ("%s: Polling FW ready success!! REG_MCUFWDL:0x%08x\n", __func__, value32));
                        return _SUCCESS;
                }
                rtw_udelay_os(5);
        } while (counter++ < POLLING_READY_TIMEOUT_COUNT);
 
-       RT_TRACE(_module_hal_init_c_, _drv_err_, ("%s: Polling FW ready fail!! REG_MCUFWDL:0x%08x\n", __FUNCTION__, value32));
+       RT_TRACE(_module_hal_init_c_, _drv_err_, ("%s: Polling FW ready fail!! REG_MCUFWDL:0x%08x\n", __func__, value32));
        return _FAIL;
 }
 
@@ -279,7 +279,7 @@ void rtl8723a_FirmwareSelfReset(PADAPTER padapter)
                        rtw_udelay_os(50);
                        u1bTmp = rtw_read8(padapter, REG_SYS_FUNC_EN+1);
                }
-               RT_TRACE(_module_hal_init_c_, _drv_info_, ("-%s: 8051 reset success (%d)\n", __FUNCTION__, Delay));
+               RT_TRACE(_module_hal_init_c_, _drv_info_, ("-%s: 8051 reset success (%d)\n", __func__, Delay));
 
                if ((Delay == 0) && IS_HARDWARE_TYPE_8723AU(padapter))
                {
@@ -645,7 +645,7 @@ s32 rtl8723a_FirmwareDownload(PADAPTER padapter)
        u32                     FirmwareLen;
 
 
-       RT_TRACE(_module_hal_init_c_, _drv_info_, ("+%s\n", __FUNCTION__));
+       RT_TRACE(_module_hal_init_c_, _drv_info_, ("+%s\n", __func__));
        pFirmware = (PRT_FIRMWARE_8723A)rtw_zmalloc(sizeof(RT_FIRMWARE_8723A));
        pBTFirmware = (PRT_FIRMWARE_8723A)rtw_zmalloc(sizeof(RT_FIRMWARE_8723A));
 
@@ -684,7 +684,7 @@ s32 rtl8723a_FirmwareDownload(PADAPTER padapter)
                else
                {
                        // <Roger_TODO> We should download proper RAM Code here  to match the ROM code.
-                       RT_TRACE(_module_hal_init_c_, _drv_err_, ("%s: unknow version!\n", __FUNCTION__));
+                       RT_TRACE(_module_hal_init_c_, _drv_err_, ("%s: unknow version!\n", __func__));
 //                     return RT_STATUS_FAILURE;
                        rtStatus = _FAIL;
                        goto Exit;
@@ -692,7 +692,7 @@ s32 rtl8723a_FirmwareDownload(PADAPTER padapter)
        }
        else
        {
-               RT_TRACE(_module_hal_init_c_, _drv_err_, ("%s: unknow chip!\n", __FUNCTION__));
+               RT_TRACE(_module_hal_init_c_, _drv_err_, ("%s: unknow chip!\n", __func__));
                rtStatus = _FAIL;
                goto Exit;
        }
@@ -702,13 +702,13 @@ s32 rtl8723a_FirmwareDownload(PADAPTER padapter)
        #ifdef CONFIG_FILE_FWIMG
        if (rtw_is_file_readable(rtw_fw_file_path) == true)
        {
-               DBG_871X("%s accquire FW from file:%s\n", __FUNCTION__, rtw_fw_file_path);
+               DBG_871X("%s accquire FW from file:%s\n", __func__, rtw_fw_file_path);
                pFirmware->eFWSource = FW_SOURCE_IMG_FILE; // We should decided by Reg.
        }
        else
        #endif //CONFIG_FILE_FWIMG
        {
-               DBG_871X("%s accquire FW from embedded image\n", __FUNCTION__);
+               DBG_871X("%s accquire FW from embedded image\n", __func__);
                pFirmware->eFWSource = FW_SOURCE_HEADER_FILE;
        }
 
@@ -757,7 +757,7 @@ s32 rtl8723a_FirmwareDownload(PADAPTER padapter)
        pHalData->FirmwareSignature = le16_to_cpu(pFwHdr->Signature);
 
        DBG_871X("%s: fw_ver=%d fw_subver=%d sig=0x%x\n",
-                 __FUNCTION__, pHalData->FirmwareVersion, pHalData->FirmwareSubVersion, pHalData->FirmwareSignature);
+                 __func__, pHalData->FirmwareVersion, pHalData->FirmwareSubVersion, pHalData->FirmwareSignature);
 
        if (IS_FW_HEADER_EXIST(pFwHdr))
        {
@@ -787,7 +787,7 @@ s32 rtl8723a_FirmwareDownload(PADAPTER padapter)
                )
                        break;
 
-               DBG_871X("%s writeFW_retry:%u, time after fwdl_start_time:%ums\n", __FUNCTION__
+               DBG_871X("%s writeFW_retry:%u, time after fwdl_start_time:%ums\n", __func__
                        , writeFW_retry
                        , rtw_get_passing_time_ms(fwdl_start_time)
                );
@@ -865,7 +865,7 @@ hal_EfuseSwitchToBank(
 #endif
 
 
-       DBG_8192C("%s: Efuse switch bank to %d\n", __FUNCTION__, bank);
+       DBG_8192C("%s: Efuse switch bank to %d\n", __func__, bank);
        if (bPseudoTest)
        {
 #ifdef HAL_EFUSE_MEMORY
@@ -1090,14 +1090,14 @@ hal_ReadEFuse_WiFi(
        //
        if ((_offset+_size_byte) > EFUSE_MAP_LEN_8723A)
        {
-               DBG_8192C("%s: Invalid offset(%#x) with read bytes(%#x)!!\n", __FUNCTION__, _offset, _size_byte);
+               DBG_8192C("%s: Invalid offset(%#x) with read bytes(%#x)!!\n", __func__, _offset, _size_byte);
                return;
        }
 
        efuseTbl = (u8*)rtw_malloc(EFUSE_MAP_LEN_8723A);
        if (efuseTbl == NULL)
        {
-               DBG_8192C("%s: alloc efuseTbl fail!\n", __FUNCTION__);
+               DBG_8192C("%s: alloc efuseTbl fail!\n", __func__);
                return;
        }
        // 0xff will be efuse default value instead of 0x00.
@@ -1111,19 +1111,19 @@ hal_ReadEFuse_WiFi(
                ReadEFuseByte(padapter, eFuse_Addr++, &efuseHeader, bPseudoTest);
                if (efuseHeader == 0xFF)
                {
-                       DBG_8192C("%s: data end at address=%#x\n", __FUNCTION__, eFuse_Addr);
+                       DBG_8192C("%s: data end at address=%#x\n", __func__, eFuse_Addr);
                        break;
                }
-//             DBG_8192C("%s: efuse[0x%X]=0x%02X\n", __FUNCTION__, eFuse_Addr-1, efuseHeader);
+//             DBG_8192C("%s: efuse[0x%X]=0x%02X\n", __func__, eFuse_Addr-1, efuseHeader);
 
                // Check PG header for section num.
                if (EXT_HEADER(efuseHeader))            //extended header
                {
                        offset = GET_HDR_OFFSET_2_0(efuseHeader);
-//                     DBG_8192C("%s: extended header offset_2_0=0x%X\n", __FUNCTION__, offset_2_0);
+//                     DBG_8192C("%s: extended header offset_2_0=0x%X\n", __func__, offset_2_0);
 
                        ReadEFuseByte(padapter, eFuse_Addr++, &efuseExtHdr, bPseudoTest);
-//                     DBG_8192C("%s: efuse[0x%X]=0x%02X\n", __FUNCTION__, eFuse_Addr-1, efuseExtHdr);
+//                     DBG_8192C("%s: efuse[0x%X]=0x%02X\n", __func__, eFuse_Addr-1, efuseExtHdr);
                        if (ALL_WORDS_DISABLED(efuseExtHdr))
                        {
                                continue;
@@ -1142,7 +1142,7 @@ hal_ReadEFuse_WiFi(
                {
                        u16 addr;
                        // Get word enable value from PG header
-//                     DBG_8192C("%s: Offset=%d Worden=0x%X\n", __FUNCTION__, offset, wden);
+//                     DBG_8192C("%s: Offset=%d Worden=0x%X\n", __func__, offset, wden);
 
                        addr = offset * PGPKT_DATA_SIZE;
                        for (i=0; i<EFUSE_MAX_WORD_UNIT; i++)
@@ -1151,11 +1151,11 @@ hal_ReadEFuse_WiFi(
                                if (!(wden & (0x01<<i)))
                                {
                                        ReadEFuseByte(padapter, eFuse_Addr++, &efuseData, bPseudoTest);
-//                                     DBG_8192C("%s: efuse[%#X]=0x%02X\n", __FUNCTION__, eFuse_Addr-1, efuseData);
+//                                     DBG_8192C("%s: efuse[%#X]=0x%02X\n", __func__, eFuse_Addr-1, efuseData);
                                        efuseTbl[addr] = efuseData;
 
                                        ReadEFuseByte(padapter, eFuse_Addr++, &efuseData, bPseudoTest);
-//                                     DBG_8192C("%s: efuse[%#X]=0x%02X\n", __FUNCTION__, eFuse_Addr-1, efuseData);
+//                                     DBG_8192C("%s: efuse[%#X]=0x%02X\n", __func__, eFuse_Addr-1, efuseData);
                                        efuseTbl[addr+1] = efuseData;
                                }
                                addr += 2;
@@ -1163,7 +1163,7 @@ hal_ReadEFuse_WiFi(
                }
                else
                {
-                       DBG_8192C(KERN_ERR "%s: offset(%d) is illegal!!\n", __FUNCTION__, offset);
+                       DBG_8192C(KERN_ERR "%s: offset(%d) is illegal!!\n", __func__, offset);
                        eFuse_Addr += Efuse_CalculateWordCnts(wden)*2;
                }
        }
@@ -1221,13 +1221,13 @@ hal_ReadEFuse_BT(
        //
        if ((_offset+_size_byte) > EFUSE_BT_MAP_LEN)
        {
-               DBG_8192C("%s: Invalid offset(%#x) with read bytes(%#x)!!\n", __FUNCTION__, _offset, _size_byte);
+               DBG_8192C("%s: Invalid offset(%#x) with read bytes(%#x)!!\n", __func__, _offset, _size_byte);
                return;
        }
 
        efuseTbl = rtw_malloc(EFUSE_BT_MAP_LEN);
        if (efuseTbl == NULL) {
-               DBG_8192C("%s: efuseTbl malloc fail!\n", __FUNCTION__);
+               DBG_8192C("%s: efuseTbl malloc fail!\n", __func__);
                return;
        }
        // 0xff will be efuse default value instead of 0x00.
@@ -1239,7 +1239,7 @@ hal_ReadEFuse_BT(
        {
                if (hal_EfuseSwitchToBank(padapter, bank, bPseudoTest) == false)
                {
-                       DBG_8192C("%s: hal_EfuseSwitchToBank Fail!!\n", __FUNCTION__);
+                       DBG_8192C("%s: hal_EfuseSwitchToBank Fail!!\n", __func__);
                        goto exit;
                }
 
@@ -1249,16 +1249,16 @@ hal_ReadEFuse_BT(
                {
                        ReadEFuseByte(padapter, eFuse_Addr++, &efuseHeader, bPseudoTest);
                        if (efuseHeader == 0xFF) break;
-//                     DBG_8192C("%s: efuse[%#X]=0x%02x (header)\n", __FUNCTION__, (((bank-1)*EFUSE_REAL_CONTENT_LEN)+eFuse_Addr-1), efuseHeader);
+//                     DBG_8192C("%s: efuse[%#X]=0x%02x (header)\n", __func__, (((bank-1)*EFUSE_REAL_CONTENT_LEN)+eFuse_Addr-1), efuseHeader);
 
                        // Check PG header for section num.
                        if (EXT_HEADER(efuseHeader))            //extended header
                        {
                                offset = GET_HDR_OFFSET_2_0(efuseHeader);
-//                             DBG_8192C("%s: extended header offset_2_0=0x%X\n", __FUNCTION__, offset_2_0);
+//                             DBG_8192C("%s: extended header offset_2_0=0x%X\n", __func__, offset_2_0);
 
                                ReadEFuseByte(padapter, eFuse_Addr++, &efuseExtHdr, bPseudoTest);
-//                             DBG_8192C("%s: efuse[%#X]=0x%02x (ext header)\n", __FUNCTION__, (((bank-1)*EFUSE_REAL_CONTENT_LEN)+eFuse_Addr-1), efuseExtHdr);
+//                             DBG_8192C("%s: efuse[%#X]=0x%02x (ext header)\n", __func__, (((bank-1)*EFUSE_REAL_CONTENT_LEN)+eFuse_Addr-1), efuseExtHdr);
                                if (ALL_WORDS_DISABLED(efuseExtHdr))
                                {
                                        continue;
@@ -1278,7 +1278,7 @@ hal_ReadEFuse_BT(
                                u16 addr;
 
                                // Get word enable value from PG header
-//                             DBG_8192C("%s: Offset=%d Worden=%#X\n", __FUNCTION__, offset, wden);
+//                             DBG_8192C("%s: Offset=%d Worden=%#X\n", __func__, offset, wden);
 
                                addr = offset * PGPKT_DATA_SIZE;
                                for (i=0; i<EFUSE_MAX_WORD_UNIT; i++)
@@ -1287,11 +1287,11 @@ hal_ReadEFuse_BT(
                                        if (!(wden & (0x01<<i)))
                                        {
                                                ReadEFuseByte(padapter, eFuse_Addr++, &efuseData, bPseudoTest);
-//                                             DBG_8192C("%s: efuse[%#X]=0x%02X\n", __FUNCTION__, eFuse_Addr-1, efuseData);
+//                                             DBG_8192C("%s: efuse[%#X]=0x%02X\n", __func__, eFuse_Addr-1, efuseData);
                                                efuseTbl[addr] = efuseData;
 
                                                ReadEFuseByte(padapter, eFuse_Addr++, &efuseData, bPseudoTest);
-//                                             DBG_8192C("%s: efuse[%#X]=0x%02X\n", __FUNCTION__, eFuse_Addr-1, efuseData);
+//                                             DBG_8192C("%s: efuse[%#X]=0x%02X\n", __func__, eFuse_Addr-1, efuseData);
                                                efuseTbl[addr+1] = efuseData;
                                        }
                                        addr += 2;
@@ -1299,14 +1299,14 @@ hal_ReadEFuse_BT(
                        }
                        else
                        {
-                               DBG_8192C(KERN_ERR "%s: offset(%d) is illegal!!\n", __FUNCTION__, offset);
+                               DBG_8192C(KERN_ERR "%s: offset(%d) is illegal!!\n", __func__, offset);
                                eFuse_Addr += Efuse_CalculateWordCnts(wden)*2;
                        }
                }
 
                if ((eFuse_Addr-1) < total)
                {
-                       DBG_8192C("%s: bank(%d) data end at %#x\n", __FUNCTION__, bank, eFuse_Addr-1);
+                       DBG_8192C("%s: bank(%d) data end at %#x\n", __func__, bank, eFuse_Addr-1);
                        break;
                }
        }
@@ -1384,7 +1384,7 @@ hal_EfuseGetCurrentSize_WiFi(
        {
                rtw_hal_get_hwreg(padapter, HW_VAR_EFUSE_BYTES, (u8*)&efuse_addr);
        }
-       DBG_8192C("%s: start_efuse_addr=0x%X\n", __FUNCTION__, efuse_addr);
+       DBG_8192C("%s: start_efuse_addr=0x%X\n", __func__, efuse_addr);
 
        // switch bank back to bank 0 for later BT and wifi use.
        hal_EfuseSwitchToBank(padapter, 0, bPseudoTest);
@@ -1393,7 +1393,7 @@ hal_EfuseGetCurrentSize_WiFi(
        {
                if (efuse_OneByteRead(padapter, efuse_addr, &efuse_data, bPseudoTest) == false)
                {
-                       DBG_8192C(KERN_ERR "%s: efuse_OneByteRead Fail! addr=0x%X !!\n", __FUNCTION__, efuse_addr);
+                       DBG_8192C(KERN_ERR "%s: efuse_OneByteRead Fail! addr=0x%X !!\n", __func__, efuse_addr);
                        break;
                }
 
@@ -1434,7 +1434,7 @@ hal_EfuseGetCurrentSize_WiFi(
        {
                rtw_hal_set_hwreg(padapter, HW_VAR_EFUSE_BYTES, (u8*)&efuse_addr);
        }
-       DBG_8192C("%s: CurrentSize=%d\n", __FUNCTION__, efuse_addr);
+       DBG_8192C("%s: CurrentSize=%d\n", __func__, efuse_addr);
 
        return efuse_addr;
 }
@@ -1471,7 +1471,7 @@ hal_EfuseGetCurrentSize_BT(
        efuse_addr = (u16)((btusedbytes%EFUSE_BT_REAL_BANK_CONTENT_LEN));
        startBank = (u8)(1+(btusedbytes/EFUSE_BT_REAL_BANK_CONTENT_LEN));
 
-       DBG_8192C("%s: start from bank=%d addr=0x%X\n", __FUNCTION__, startBank, efuse_addr);
+       DBG_8192C("%s: start from bank=%d addr=0x%X\n", __func__, startBank, efuse_addr);
 
        EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_AVAILABLE_EFUSE_BYTES_BANK, &retU2, bPseudoTest);
 
@@ -1479,7 +1479,7 @@ hal_EfuseGetCurrentSize_BT(
        {
                if (hal_EfuseSwitchToBank(padapter, bank, bPseudoTest) == false)
                {
-                       DBG_8192C(KERN_ERR "%s: switch bank(%d) Fail!!\n", __FUNCTION__, bank);
+                       DBG_8192C(KERN_ERR "%s: switch bank(%d) Fail!!\n", __func__, bank);
                        bank = EFUSE_MAX_BANK;
                        break;
                }
@@ -1492,7 +1492,7 @@ hal_EfuseGetCurrentSize_BT(
                {
                        if (efuse_OneByteRead(padapter, efuse_addr, &efuse_data, bPseudoTest) == false)
                        {
-                               DBG_8192C(KERN_ERR "%s: efuse_OneByteRead Fail! addr=0x%X !!\n", __FUNCTION__, efuse_addr);
+                               DBG_8192C(KERN_ERR "%s: efuse_OneByteRead Fail! addr=0x%X !!\n", __func__, efuse_addr);
                                bank = EFUSE_MAX_BANK;
                                break;
                        }
@@ -1544,7 +1544,7 @@ hal_EfuseGetCurrentSize_BT(
                rtw_hal_set_hwreg(padapter, HW_VAR_EFUSE_BT_BYTES, (u8*)&retU2);
        }
 
-       DBG_8192C("%s: CurrentSize=%d\n", __FUNCTION__, retU2);
+       DBG_8192C("%s: CurrentSize=%d\n", __func__, retU2);
        return retU2;
 }
 
@@ -1578,7 +1578,7 @@ Hal_EfuseWordEnableDataWrite(
        u8      tmpdata[PGPKT_DATA_SIZE];
 
 
-//     DBG_8192C("%s: efuse_addr=%#x word_en=%#x\n", __FUNCTION__, efuse_addr, word_en);
+//     DBG_8192C("%s: efuse_addr=%#x word_en=%#x\n", __func__, efuse_addr, word_en);
        memset(tmpdata, 0xFF, PGPKT_DATA_SIZE);
 
        if (!(word_en & BIT(0)))
@@ -1655,7 +1655,7 @@ Hal_EfusePgPacketRead(
        EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAX_SECTION, &max_section, bPseudoTest);
        if (offset > max_section)
        {
-               DBG_8192C("%s: Packet offset(%d) is illegal(>%d)!\n", __FUNCTION__, offset, max_section);
+               DBG_8192C("%s: Packet offset(%d) is illegal(>%d)!\n", __func__, offset, max_section);
                return false;
        }
 
@@ -1683,7 +1683,7 @@ Hal_EfusePgPacketRead(
                        efuse_OneByteRead(padapter, efuse_addr++, &efuse_data, bPseudoTest);
                        if (ALL_WORDS_DISABLED(efuse_data))
                        {
-                               DBG_8192C("%s: Error!! All words disabled!\n", __FUNCTION__);
+                               DBG_8192C("%s: Error!! All words disabled!\n", __func__);
                                continue;
                        }
 
@@ -1704,11 +1704,11 @@ Hal_EfusePgPacketRead(
                                if (!(hworden & (0x01<<i)))
                                {
                                        ReadEFuseByte(padapter, efuse_addr++, &efuse_data, bPseudoTest);
-//                                     DBG_8192C("%s: efuse[%#X]=0x%02X\n", __FUNCTION__, efuse_addr+tmpidx, efuse_data);
+//                                     DBG_8192C("%s: efuse[%#X]=0x%02X\n", __func__, efuse_addr+tmpidx, efuse_data);
                                        data[i*2] = efuse_data;
 
                                        ReadEFuseByte(padapter, efuse_addr++, &efuse_data, bPseudoTest);
-//                                     DBG_8192C("%s: efuse[%#X]=0x%02X\n", __FUNCTION__, efuse_addr+tmpidx, efuse_data);
+//                                     DBG_8192C("%s: efuse[%#X]=0x%02X\n", __func__, efuse_addr+tmpidx, efuse_data);
                                        data[(i*2)+1] = efuse_data;
                                }
                        }
@@ -1734,12 +1734,12 @@ hal_EfusePgCheckAvailableAddr(
 
 
        EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, &max_available, bPseudoTest);
-//     DBG_8192C("%s: max_available=%d\n", __FUNCTION__, max_available);
+//     DBG_8192C("%s: max_available=%d\n", __func__, max_available);
 
        current_size = Efuse_GetCurrentSize(pAdapter, efuseType, bPseudoTest);
        if (current_size >= max_available)
        {
-               DBG_8192C("%s: Error!! current_size(%d)>max_available(%d)\n", __FUNCTION__, current_size, max_available);
+               DBG_8192C("%s: Error!! current_size(%d)>max_available(%d)\n", __func__, current_size, max_available);
                return false;
        }
        return true;
@@ -1806,7 +1806,7 @@ hal_EfusePartialWriteCheck(
                }
        }
        startAddr %= efuse_max;
-//     DBG_8192C("%s: startAddr=%#X\n", __FUNCTION__, startAddr);
+//     DBG_8192C("%s: startAddr=%#X\n", __func__, startAddr);
 
        while (1)
        {
@@ -1814,7 +1814,7 @@ hal_EfusePartialWriteCheck(
                {
                        bRet = false;
                        DBG_8192C("%s: startAddr(%d) >= efuse_max_available_len(%d)\n",
-                               __FUNCTION__, startAddr, efuse_max_available_len);
+                               __func__, startAddr, efuse_max_available_len);
                        break;
                }
 
@@ -1823,7 +1823,7 @@ hal_EfusePartialWriteCheck(
 #if 1
                        bRet = false;
                        DBG_8192C("%s: Something Wrong! last bytes(%#X=0x%02X) is not 0xFF\n",
-                               __FUNCTION__, startAddr, efuse_data);
+                               __func__, startAddr, efuse_data);
                        break;
 #else
                        if (EXT_HEADER(efuse_data))
@@ -1833,7 +1833,7 @@ hal_EfusePartialWriteCheck(
                                efuse_OneByteRead(padapter, startAddr, &efuse_data, bPseudoTest);
                                if (ALL_WORDS_DISABLED(efuse_data))
                                {
-                                       DBG_8192C("%s: Error condition, all words disabled!", __FUNCTION__);
+                                       DBG_8192C("%s: Error condition, all words disabled!", __func__);
                                        bRet = false;
                                        break;
                                }
@@ -1857,7 +1857,7 @@ hal_EfusePartialWriteCheck(
                                (hal_EfuseCheckIfDatafollowed(padapter, curPkt.word_cnts, startAddr+1, bPseudoTest) == false) &&
                                wordEnMatched(pTargetPkt, &curPkt, &matched_wden) == true)
                        {
-                               DBG_8192C("%s: Need to partial write data by the previous wrote header\n", __FUNCTION__);
+                               DBG_8192C("%s: Need to partial write data by the previous wrote header\n", __func__);
                                // Here to write partial data
                                badworden = Efuse_WordEnableDataWrite(padapter, startAddr+1, matched_wden, pTargetPkt->data, bPseudoTest);
                                if (badworden != 0x0F)
@@ -1893,7 +1893,7 @@ hal_EfusePartialWriteCheck(
                {
                        // not used header, 0xff
                        *pAddr = startAddr;
-//                     DBG_8192C("%s: Started from unused header offset=%d\n", __FUNCTION__, startAddr));
+//                     DBG_8192C("%s: Started from unused header offset=%d\n", __func__, startAddr));
                        bRet = true;
                        break;
                }
@@ -1916,7 +1916,7 @@ hal_EfusePgPacketWrite1ByteHeader(
        u8      repeatcnt=0;
 
 
-//     DBG_8192C("%s\n", __FUNCTION__);
+//     DBG_8192C("%s\n", __func__);
        pg_header = ((pTargetPkt->offset << 4) & 0xf0) | pTargetPkt->word_en;
 
        do {
@@ -1925,14 +1925,14 @@ hal_EfusePgPacketWrite1ByteHeader(
                if (tmp_header != 0xFF) break;
                if (repeatcnt++ > EFUSE_REPEAT_THRESHOLD_)
                {
-                       DBG_8192C("%s: Repeat over limit for pg_header!!\n", __FUNCTION__);
+                       DBG_8192C("%s: Repeat over limit for pg_header!!\n", __func__);
                        return false;
                }
        } while (1);
 
        if (tmp_header != pg_header)
        {
-               DBG_8192C(KERN_ERR "%s: PG Header Fail!!(pg=0x%02X read=0x%02X)\n", __FUNCTION__, pg_header, tmp_header);
+               DBG_8192C(KERN_ERR "%s: PG Header Fail!!(pg=0x%02X read=0x%02X)\n", __func__, pg_header, tmp_header);
                return false;
        }
 
@@ -1954,18 +1954,18 @@ hal_EfusePgPacketWrite2ByteHeader(
        u8      repeatcnt=0;
 
 
-//     DBG_8192C("%s\n", __FUNCTION__);
+//     DBG_8192C("%s\n", __func__);
        EFUSE_GetEfuseDefinition(padapter, efuseType, TYPE_AVAILABLE_EFUSE_BYTES_BANK, &efuse_max_available_len, bPseudoTest);
 
        efuse_addr = *pAddr;
        if (efuse_addr >= efuse_max_available_len)
        {
-               DBG_8192C("%s: addr(%d) over avaliable(%d)!!\n", __FUNCTION__, efuse_addr, efuse_max_available_len);
+               DBG_8192C("%s: addr(%d) over avaliable(%d)!!\n", __func__, efuse_addr, efuse_max_available_len);
                return false;
        }
 
        pg_header = ((pTargetPkt->offset & 0x07) << 5) | 0x0F;
-//     DBG_8192C("%s: pg_header=0x%x\n", __FUNCTION__, pg_header);
+//     DBG_8192C("%s: pg_header=0x%x\n", __func__, pg_header);
 
        do {
                efuse_OneByteWrite(padapter, efuse_addr, pg_header, bPseudoTest);
@@ -1973,14 +1973,14 @@ hal_EfusePgPacketWrite2ByteHeader(
                if (tmp_header != 0xFF) break;
                if (repeatcnt++ > EFUSE_REPEAT_THRESHOLD_)
                {
-                       DBG_8192C("%s: Repeat over limit for pg_header!!\n", __FUNCTION__);
+                       DBG_8192C("%s: Repeat over limit for pg_header!!\n", __func__);
                        return false;
                }
        } while (1);
 
        if (tmp_header != pg_header)
        {
-               DBG_8192C(KERN_ERR "%s: PG Header Fail!!(pg=0x%02X read=0x%02X)\n", __FUNCTION__, pg_header, tmp_header);
+               DBG_8192C(KERN_ERR "%s: PG Header Fail!!(pg=0x%02X read=0x%02X)\n", __func__, pg_header, tmp_header);
                return false;
        }
 
@@ -1994,14 +1994,14 @@ hal_EfusePgPacketWrite2ByteHeader(
                if (tmp_header != 0xFF) break;
                if (repeatcnt++ > EFUSE_REPEAT_THRESHOLD_)
                {
-                       DBG_8192C("%s: Repeat over limit for ext_header!!\n", __FUNCTION__);
+                       DBG_8192C("%s: Repeat over limit for ext_header!!\n", __func__);
                        return false;
                }
        } while (1);
 
        if (tmp_header != pg_header)    //offset PG fail
        {
-               DBG_8192C(KERN_ERR "%s: PG EXT Header Fail!!(pg=0x%02X read=0x%02X)\n", __FUNCTION__, pg_header, tmp_header);
+               DBG_8192C(KERN_ERR "%s: PG EXT Header Fail!!(pg=0x%02X read=0x%02X)\n", __func__, pg_header, tmp_header);
                return false;
        }
 
@@ -2048,11 +2048,11 @@ hal_EfusePgPacketWriteData(
        badworden = Efuse_WordEnableDataWrite(pAdapter, efuse_addr+1, pTargetPkt->word_en, pTargetPkt->data, bPseudoTest);
        if (badworden != 0x0F)
        {
-               DBG_8192C("%s: Fail!!\n", __FUNCTION__);
+               DBG_8192C("%s: Fail!!\n", __func__);
                return false;
        }
 
-//     DBG_8192C("%s: ok\n", __FUNCTION__);
+//     DBG_8192C("%s: ok\n", __func__);
        return true;
 }
 
@@ -2410,7 +2410,7 @@ static s32 c2h_handler_8723a(_adapter *padapter, struct c2h_evt_hdr *c2h_evt)
        u8 i = 0;
 
        if (c2h_evt == NULL) {
-               DBG_8192C("%s c2h_evt is NULL\n",__FUNCTION__);
+               DBG_8192C("%s c2h_evt is NULL\n",__func__);
                ret = _FAIL;
                goto exit;
        }
@@ -2441,7 +2441,7 @@ static s32 c2h_handler_8723a(_adapter *padapter, struct c2h_evt_hdr *c2h_evt)
 #endif
 #ifdef CONFIG_MP_INCLUDED
        case C2H_BT_MP_INFO:
-               DBG_8192C("%s ,  Got  C2H_BT_MP_INFO\n",__FUNCTION__);
+               DBG_8192C("%s ,  Got  C2H_BT_MP_INFO\n",__func__);
                MPTBT_FwC2hBtMpCtrl(padapter, c2h_evt->payload, c2h_evt->plen);
                break;
 #endif
@@ -3418,7 +3418,7 @@ Hal_EfuseParseXtal_8723A(
        else {
                pHalData->CrystalCap = EEPROM_Default_CrystalCap_8723A;
        }
-       RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("%s: CrystalCap=0x%2x\n", __FUNCTION__, pHalData->CrystalCap));
+       RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("%s: CrystalCap=0x%2x\n", __func__, pHalData->CrystalCap));
 }
 
 void
@@ -3445,7 +3445,7 @@ Hal_EfuseParseThermalMeter_8723A(
                pHalData->EEPROMThermalMeter = EEPROM_Default_ThermalMeter;
        }
 
-       DBG_8192C("%s: ThermalMeter=0x%x\n", __FUNCTION__, pHalData->EEPROMThermalMeter);
+       DBG_8192C("%s: ThermalMeter=0x%x\n", __func__, pHalData->EEPROMThermalMeter);
 }
 
 void Hal_InitChannelPlan(IN            PADAPTER        padapter)
@@ -3669,7 +3669,7 @@ void rtl8723a_fill_default_txdesc(
 
 #ifdef CONFIG_INTEL_PROXIM
                if ((padapter->proximity.proxim_on==true)&&(pattrib->intel_proxim==true)) {
-                       DBG_871X("\n %s pattrib->rate=%d\n",__FUNCTION__,pattrib->rate);
+                       DBG_871X("\n %s pattrib->rate=%d\n",__func__,pattrib->rate);
                        ptxdesc->datarate = pattrib->rate;
                }
                else
@@ -3680,7 +3680,7 @@ void rtl8723a_fill_default_txdesc(
        }
        else if (pxmitframe->frame_tag == TXAGG_FRAMETAG)
        {
-               RT_TRACE(_module_hal_xmit_c_, _drv_warning_, ("%s: TXAGG_FRAMETAG\n", __FUNCTION__));
+               RT_TRACE(_module_hal_xmit_c_, _drv_warning_, ("%s: TXAGG_FRAMETAG\n", __func__));
        }
 #ifdef CONFIG_MP_INCLUDED
        else if (pxmitframe->frame_tag == MP_FRAMETAG)
@@ -3688,7 +3688,7 @@ void rtl8723a_fill_default_txdesc(
                struct tx_desc *pdesc;
 
                pdesc = (struct tx_desc*)ptxdesc;
-               RT_TRACE(_module_hal_xmit_c_, _drv_notice_, ("%s: MP_FRAMETAG\n", __FUNCTION__));
+               RT_TRACE(_module_hal_xmit_c_, _drv_notice_, ("%s: MP_FRAMETAG\n", __func__));
                fill_txdesc_for_mp(padapter, pdesc);
 
                pdesc->txdw0 = le32_to_cpu(pdesc->txdw0);
@@ -3703,7 +3703,7 @@ void rtl8723a_fill_default_txdesc(
 #endif
        else
        {
-               RT_TRACE(_module_hal_xmit_c_, _drv_warning_, ("%s: frame_tag=0x%x\n", __FUNCTION__, pxmitframe->frame_tag));
+               RT_TRACE(_module_hal_xmit_c_, _drv_warning_, ("%s: frame_tag=0x%x\n", __func__, pxmitframe->frame_tag));
 
                ptxdesc->macid = 4; // CAM_ID(MAC_ID)
                ptxdesc->rate_id = 6; // Rate ID
@@ -3942,7 +3942,7 @@ static void hw_var_set_opmode(PADAPTER padapter, u8 variable, u8 *val)
                if ( check_buddy_fwstate(padapter, (WIFI_STATION_STATE|WIFI_ASOC_STATE)) ) {
                        if (reset_tsf(padapter, padapter->iface_type) == false)
                                DBG_871X("ERROR! %s()-%d: Reset port%d TSF fail\n",
-                                       __FUNCTION__, __LINE__,
+                                       __func__, __LINE__,
                                        (padapter->iface_type==IFACE_PORT1)? 1 : 0);
                }
 #endif // CONFIG_TSF_RESET_OFFLOAD
@@ -4076,11 +4076,11 @@ static void hw_var_set_correct_tsf(PADAPTER padapter, u8 variable, u8 *val)
                if (padapter->iface_type == IFACE_PORT1) {
                        if (reset_tsf(padapter, IFACE_PORT0) == false)
                                DBG_871X("ERROR! %s()-%d: Reset port0 TSF fail\n",
-                               __FUNCTION__, __LINE__);
+                               __func__, __LINE__);
                } else {
                        if (reset_tsf(padapter, IFACE_PORT1) == false)
                                DBG_871X("ERROR! %s()-%d: Reset port1 TSF fail\n",
-                               __FUNCTION__, __LINE__);
+                               __func__, __LINE__);
                }
        }
 #endif // CONFIG_TSF_RESET_OFFLOAD
index 9e90a69..48f5e90 100755 (executable)
@@ -142,7 +142,7 @@ void rtl8723a_silentreset_for_specific_platform(_adapter *padapter)
 
 #ifdef DBG_CONFIG_ERROR_RESET
 
-       DBG_871X("%s\n", __FUNCTION__);
+       DBG_871X("%s\n", __func__);
 
        psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS;
 
@@ -189,12 +189,12 @@ void rtl8723a_sreset_xmit_status_check(_adapter *padapter)
 
 
        if ( (txdma_status=rtw_read32(padapter, REG_TXDMA_STATUS)) !=0x00) {
-               DBG_871X("%s REG_TXDMA_STATUS:0x%08x\n", __FUNCTION__, txdma_status);
+               DBG_871X("%s REG_TXDMA_STATUS:0x%08x\n", __func__, txdma_status);
                rtl8723a_silentreset_for_specific_platform(padapter);
        }
 
        //total xmit irp = 4
-       //DBG_8192C("==>%s free_xmitbuf_cnt(%d),txirp_cnt(%d)\n",__FUNCTION__,pxmitpriv->free_xmitbuf_cnt,pxmitpriv->txirp_cnt);
+       //DBG_8192C("==>%s free_xmitbuf_cnt(%d),txirp_cnt(%d)\n",__func__,pxmitpriv->free_xmitbuf_cnt,pxmitpriv->txirp_cnt);
        //if (pxmitpriv->txirp_cnt == NR_XMITBUFF+1)
        current_time = rtw_get_current_time();
        if (0==pxmitpriv->free_xmitbuf_cnt)
@@ -209,7 +209,7 @@ void rtl8723a_sreset_xmit_status_check(_adapter *padapter)
                                diff_time = jiffies_to_msecs(current_time - psrtpriv->last_tx_complete_time);
                                if (diff_time > 4000) {
                                        //padapter->Wifi_Error_Status = WIFI_TX_HANG;
-                                       DBG_8192C("%s tx hang\n", __FUNCTION__);
+                                       DBG_8192C("%s tx hang\n", __func__);
                                        rtl8723a_silentreset_for_specific_platform(padapter);
                                }
                        }
index d973866..660b16f 100644 (file)
@@ -297,7 +297,7 @@ void update_recvframe_phyinfo(
        if (psta)
        {
              pkt_info.StationID = psta->mac_id;
-               //printk("%s ==> StationID(%d)\n",__FUNCTION__,pkt_info.StationID);
+               //printk("%s ==> StationID(%d)\n",__func__,pkt_info.StationID);
        }
        pkt_info.Rate = pattrib->mcs_rate;
 
index 248fa12..3978d2b 100755 (executable)
@@ -330,7 +330,7 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz, u8 bag
 
 #ifdef CONFIG_INTEL_PROXIM
                if ((padapter->proximity.proxim_on==true)&&(pattrib->intel_proxim==true)) {
-                       DBG_871X("\n %s pattrib->rate=%d\n",__FUNCTION__,pattrib->rate);
+                       DBG_871X("\n %s pattrib->rate=%d\n",__func__,pattrib->rate);
                        ptxdesc->txdw5 |= cpu_to_le32( pattrib->rate);
                }
                else
@@ -436,7 +436,7 @@ s32 rtl8723au_xmit_buf_handler(PADAPTER padapter)
        ret = _rtw_down_sema(&pxmitpriv->xmit_sema);
        if (_FAIL == ret) {
                RT_TRACE(_module_hal_xmit_c_, _drv_emerg_,
-                                ("%s: down SdioXmitBufSema fail!\n", __FUNCTION__));
+                                ("%s: down SdioXmitBufSema fail!\n", __func__));
                return _FAIL;
        }
 
@@ -444,7 +444,7 @@ s32 rtl8723au_xmit_buf_handler(PADAPTER padapter)
        if (ret) {
                RT_TRACE(_module_hal_xmit_c_, _drv_notice_,
                                 ("%s: bDriverStopped(%d) bSurpriseRemoved(%d)!\n",
-                                 __FUNCTION__, padapter->bDriverStopped, padapter->bSurpriseRemoved));
+                                 __func__, padapter->bDriverStopped, padapter->bSurpriseRemoved));
                return _FAIL;
        }
 
@@ -455,7 +455,7 @@ s32 rtl8723au_xmit_buf_handler(PADAPTER padapter)
        ret = rtw_register_tx_alive(padapter);
        if (ret != _SUCCESS) {
                RT_TRACE(_module_hal_xmit_c_, _drv_notice_,
-                                ("%s: wait to leave LPS_LCLK\n", __FUNCTION__));
+                                ("%s: wait to leave LPS_LCLK\n", __func__));
                return _SUCCESS;
        }
 #endif
index a75765c..0c166e3 100644 (file)
@@ -1290,7 +1290,7 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_BEGIN);
        // Check if MAC has already power on. by tynli. 2011.05.27.
        val8 = rtw_read8(Adapter, REG_CR);
        RT_TRACE(_module_hci_hal_init_c_, _drv_info_,
-                        ("%s: REG_CR 0x100=0x%02x\n", __FUNCTION__, val8));
+                        ("%s: REG_CR 0x100=0x%02x\n", __func__, val8));
        //Fix 92DU-VC S3 hang with the reason is that secondary mac is not initialized.
        //0x100 value of first mac is 0xEA while 0x100 value of secondary is 0x00
        //by sherry 20111102
@@ -1299,7 +1299,7 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_BEGIN);
        } else {
                pHalData->bMACFuncEnable = true;
                RT_TRACE(_module_hci_hal_init_c_, _drv_info_,
-                                ("%s: MAC has already power on\n", __FUNCTION__));
+                                ("%s: MAC has already power on\n", __func__));
        }
 
 
@@ -1444,7 +1444,7 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_RF);
        PHY_SetBBReg(Adapter, rFPGA0_XAB_RFInterfaceSW, bMaskDWord, 0x07000760);        //0x870[6:5]=b'11
        PHY_SetBBReg(Adapter, rFPGA0_XA_RFInterfaceOE, bMaskDWord, 0x66F60210); //0x860[6:5]=b'00
 
-       RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("%s: 0x870 = value 0x%x\n", __FUNCTION__, PHY_QueryBBReg(Adapter, 0x870, bMaskDWord)));
+       RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("%s: 0x870 = value 0x%x\n", __func__, PHY_QueryBBReg(Adapter, 0x870, bMaskDWord)));
 
 #endif
 
@@ -1625,11 +1625,11 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_MISC31);
        if (!IS_HARDWARE_TYPE_8192DU(Adapter) && ((rtw_read32(Adapter, rFPGA0_RFMOD) & 0xFF000000) != 0x83000000))
        {
                PHY_SetBBReg(Adapter, rFPGA0_RFMOD, BIT(24), 1);
-               RT_TRACE(_module_hci_hal_init_c_, _drv_err_, ("%s: IQK fail recorver\n", __FUNCTION__));
+               RT_TRACE(_module_hci_hal_init_c_, _drv_err_, ("%s: IQK fail recorver\n", __func__));
        }
        else
        {
-               RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("%s: IQK OK\n", __FUNCTION__));
+               RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("%s: IQK OK\n", __func__));
        }
 
 #ifdef CONFIG_XMIT_ACK
@@ -1642,7 +1642,7 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_MISC31);
 exit:
 HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_END);
 
-       DBG_871X("%s in %dms\n", __FUNCTION__, rtw_get_passing_time_ms(init_start_time));
+       DBG_871X("%s in %dms\n", __func__, rtw_get_passing_time_ms(init_start_time));
 
        #ifdef DBG_HAL_INIT_PROFILING
        hal_init_stages_timestamp[HAL_INIT_STAGES_END]=rtw_get_current_time();
@@ -2158,7 +2158,7 @@ _ResetDigitalProcedure1(
                {
                        u8 val;
                        if ( (val=rtw_read8(Adapter, REG_MCUFWDL)))
-                               DBG_871X("DBG_SHOW_MCUFWDL_BEFORE_51_ENABLE %s:%d REG_MCUFWDL:0x%02x\n", __FUNCTION__, __LINE__, val);
+                               DBG_871X("DBG_SHOW_MCUFWDL_BEFORE_51_ENABLE %s:%d REG_MCUFWDL:0x%02x\n", __func__, __LINE__, val);
                }
                #endif
 
@@ -2187,7 +2187,7 @@ _ResetDigitalProcedure1(
                                }
 
                                if (retry_cnts >= 100) {
-                                       DBG_8192C("%s #####=> 8051 reset failed!.........................\n", __FUNCTION__);
+                                       DBG_8192C("%s #####=> 8051 reset failed!.........................\n", __func__);
                                        // if 8051 reset fail we trigger GPIO 0 for LA
                                        //PlatformEFIOWrite4Byte(       Adapter,
                                        //                                              REG_GPIO_PIN_CTRL,
@@ -2197,22 +2197,22 @@ _ResetDigitalProcedure1(
                                        rtw_mdelay_os(10);
                                }
                                else {
-                                       //DBG_871X("%s =====> 8051 reset success (%d) .\n", __FUNCTION__, retry_cnts);
+                                       //DBG_871X("%s =====> 8051 reset success (%d) .\n", __func__, retry_cnts);
                                }
                        }
                        else {
-                               DBG_871X("%s =====> 8051 in RAM but !Adapter->bFWReady\n", __FUNCTION__);
+                               DBG_871X("%s =====> 8051 in RAM but !Adapter->bFWReady\n", __func__);
                        }
                }
                else {
-                       //DBG_871X("%s =====> 8051 in ROM.\n", __FUNCTION__);
+                       //DBG_871X("%s =====> 8051 in ROM.\n", __func__);
                }
 
                #ifdef DBG_SHOW_MCUFWDL_BEFORE_51_ENABLE
                {
                        u8 val;
                        if ( (val=rtw_read8(Adapter, REG_MCUFWDL)))
-                               DBG_871X("DBG_SHOW_MCUFWDL_BEFORE_51_ENABLE %s:%d REG_MCUFWDL:0x%02x\n", __FUNCTION__, __LINE__, val);
+                               DBG_871X("DBG_SHOW_MCUFWDL_BEFORE_51_ENABLE %s:%d REG_MCUFWDL:0x%02x\n", __func__, __LINE__, val);
                }
                #endif
 
@@ -2401,7 +2401,7 @@ u32 rtl8723au_hal_deinit(PADAPTER padapter)
        PHAL_DATA_TYPE  pHalData = GET_HAL_DATA(padapter);
 
 
-       DBG_8192C("==> %s\n", __FUNCTION__);
+       DBG_8192C("==> %s\n", __func__);
 
 #ifdef CONFIG_BT_COEXIST
        BT_HaltProcess(padapter);
@@ -2489,7 +2489,7 @@ unsigned int rtl8723au_inirp_deinit(PADAPTER Adapter)
        rtw_read_port_cancel(Adapter);
 #ifdef CONFIG_USB_INTERRUPT_IN_PIPE
        pHalData->IntrMask[0]=rtw_read32(Adapter, REG_USB_HIMR);
-       MSG_8192C("%s pHalData->IntrMask = 0x%04x\n",__FUNCTION__, pHalData->IntrMask[0]);
+       MSG_8192C("%s pHalData->IntrMask = 0x%04x\n",__func__, pHalData->IntrMask[0]);
        pHalData->IntrMask[0]=0x0;
        rtw_write32(Adapter, REG_USB_HIMR,pHalData->IntrMask[0]);
        RT_TRACE(_module_hci_hal_init_c_,_drv_info_,("\n <=== usb_rx_deinit\n"));
@@ -2616,7 +2616,7 @@ _ReadMACAddress(
                //sMacAddr[5] = (u8)GetRandomNumber(1, 254);
                memcpy(pEEPROM->mac_addr, sMacAddr, ETH_ALEN);
        }
-       DBG_8192C("%s MAC Address from EFUSE = "MAC_FMT"\n",__FUNCTION__, MAC_ARG(pEEPROM->mac_addr));
+       DBG_8192C("%s MAC Address from EFUSE = "MAC_FMT"\n",__func__, MAC_ARG(pEEPROM->mac_addr));
        //NicIFSetMacAddress(Adapter, Adapter->PermanentAddress);
        //RT_PRINT_ADDR(COMP_INIT|COMP_EFUSE, DBG_LOUD, "MAC Addr: %s", Adapter->PermanentAddress);
 
@@ -2758,7 +2758,7 @@ static void _ReadPSSetting(IN PADAPTER Adapter,IN u8*PROMContent,IN u8    AutoloadF
                // if hw supported, 8051 (SIE) will generate WeakUP signal( D+/D- toggle) when autoresume
                Adapter->pwrctrlpriv.bSupportRemoteWakeup = (PROMContent[EEPROM_TEST_USB_OPT] & BIT1)?true :false;
 
-               DBG_8192C("%s...bHWPwrPindetect(%x)-bHWPowerdown(%x) ,bSupportRemoteWakeup(%x)\n",__FUNCTION__,
+               DBG_8192C("%s...bHWPwrPindetect(%x)-bHWPowerdown(%x) ,bSupportRemoteWakeup(%x)\n",__func__,
                Adapter->pwrctrlpriv.bHWPwrPindetect,Adapter->pwrctrlpriv.bHWPowerdown ,Adapter->pwrctrlpriv.bSupportRemoteWakeup);
 
                DBG_8192C("### PS params=>  power_mgnt(%x),usbss_enable(%x) ###\n",Adapter->registrypriv.power_mgnt,Adapter->registrypriv.usbss_enable);
@@ -2984,7 +2984,7 @@ readAdapterInfo(
        //hal_CustomizedBehavior_8723U(Adapter);
 
 //     Adapter->bDongle = (PROMContent[EEPROM_EASY_REPLACEMENT] == 1)? 0: 1;
-       DBG_8192C("%s(): REPLACEMENT = %x\n",__FUNCTION__,padapter->bDongle);
+       DBG_8192C("%s(): REPLACEMENT = %x\n",__func__,padapter->bDongle);
 }
 
 static void _ReadPROMContent(
@@ -3129,7 +3129,7 @@ static int _ReadAdapterInfo8723AU(PADAPTER        Adapter)
 
        _InitOtherVariable(Adapter);
 
-       //MSG_8192C("%s()(done), rf_chip=0x%x, rf_type=0x%x\n",  __FUNCTION__, pHalData->rf_chip, pHalData->rf_type);
+       //MSG_8192C("%s()(done), rf_chip=0x%x, rf_type=0x%x\n",  __func__, pHalData->rf_chip, pHalData->rf_type);
 
        MSG_8192C("<==== _ReadAdapterInfo8723AU in %d ms\n", rtw_get_passing_time_ms(start));
 
@@ -3489,7 +3489,7 @@ void UpdateHalRAMask8192CUsb(PADAPTER padapter, u32 mac_id,u8 rssi_level )
        {
                rate_bitmap = ODM_Get_Rate_Bitmap(&pHalData->odmpriv,mac_id,mask,rssi_level);
                printk("%s => mac_id:%d, networkType:0x%02x, mask:0x%08x\n\t ==> rssi_level:%d, rate_bitmap:0x%08x\n",
-                       __FUNCTION__,mac_id,networkType,mask,rssi_level,rate_bitmap);
+                       __func__,mac_id,networkType,mask,rssi_level,rate_bitmap);
        }
 #endif
 
index ad0a684..5c8c625 100644 (file)
@@ -58,7 +58,7 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u
 #endif
 
 
-       //DBG_871X("%s %s:%d\n",__FUNCTION__, current->comm, current->pid);
+       //DBG_871X("%s %s:%d\n",__func__, current->comm, current->pid);
 
        if ((padapter->bSurpriseRemoved) ||(padapter->pwrctrlpriv.pnp_bstop_trx)) {
                RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usbctrl_vendorreq:(padapter->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx)!!!\n"));
@@ -67,7 +67,7 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u
        }
 
        if (len>MAX_VENDOR_REQ_CMD_SIZE) {
-               DBG_8192C( "[%s] Buffer len error ,vendor request failed\n", __FUNCTION__ );
+               DBG_8192C( "[%s] Buffer len error ,vendor request failed\n", __func__ );
                status = -EINVAL;
                goto exit;
        }
@@ -95,7 +95,7 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u
 #endif
 
        if ( pIo_buf== NULL) {
-               DBG_8192C( "[%s] pIo_buf == NULL\n", __FUNCTION__ );
+               DBG_8192C( "[%s] pIo_buf == NULL\n", __func__ );
                status = -ENOMEM;
                goto release_mutex;
        }
@@ -428,7 +428,7 @@ static void usb_read_interrupt_complete(struct urb *purb, struct pt_regs *regs)
        if (padapter->bSurpriseRemoved || padapter->bDriverStopped||padapter->bReadPortCancel)
        {
                DBG_8192C("%s() RX Warning! bDriverStopped(%d) OR bSurpriseRemoved(%d) bReadPortCancel(%d)\n",
-               __FUNCTION__,padapter->bDriverStopped, padapter->bSurpriseRemoved,padapter->bReadPortCancel);
+               __func__,padapter->bDriverStopped, padapter->bSurpriseRemoved,padapter->bReadPortCancel);
                return;
        }
 
@@ -622,7 +622,7 @@ static s32 pre_recv_entry(union recv_frame *precvframe, struct recv_stat *prxsta
 
                                } else {
                                        rtw_free_recvframe(precvframe_if2, pfree_recv_queue);
-                                       DBG_8192C("%s()-%d: alloc_skb() failed!\n", __FUNCTION__, __LINE__);
+                                       DBG_8192C("%s()-%d: alloc_skb() failed!\n", __func__, __LINE__);
                                }
 
                        }
@@ -672,7 +672,7 @@ static int recvbuf2recvframe(_adapter *padapter, struct sk_buff *pskb)
                precvframe = rtw_alloc_recvframe(pfree_recv_queue);
                if (precvframe==NULL) {
                        RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recvbuf2recvframe: precvframe==NULL\n"));
-                       DBG_8192C("%s()-%d: rtw_alloc_recvframe() failed! RX Drop!\n", __FUNCTION__, __LINE__);
+                       DBG_8192C("%s()-%d: rtw_alloc_recvframe() failed! RX Drop!\n", __func__, __LINE__);
                        goto _exit_recvbuf2recvframe;
                }
 
@@ -685,7 +685,7 @@ static int recvbuf2recvframe(_adapter *padapter, struct sk_buff *pskb)
                pattrib = &precvframe->u.hdr.attrib;
 
                if (pattrib->crc_err) {
-                       DBG_8192C("%s()-%d: RX Warning! rx CRC ERROR !!\n", __FUNCTION__, __LINE__);
+                       DBG_8192C("%s()-%d: RX Warning! rx CRC ERROR !!\n", __func__, __LINE__);
                        rtw_free_recvframe(precvframe, pfree_recv_queue);
                        goto _exit_recvbuf2recvframe;
                }
@@ -695,7 +695,7 @@ static int recvbuf2recvframe(_adapter *padapter, struct sk_buff *pskb)
                if ((pattrib->pkt_len<=0) || (pkt_offset>transfer_len))
                {
                        RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("recvbuf2recvframe: pkt_len<=0\n"));
-                       DBG_8192C("%s()-%d: RX Warning!\n", __FUNCTION__, __LINE__);
+                       DBG_8192C("%s()-%d: RX Warning!\n", __func__, __LINE__);
                        rtw_free_recvframe(precvframe, pfree_recv_queue);
                        goto _exit_recvbuf2recvframe;
                }
@@ -882,7 +882,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
                }
        #endif
                DBG_8192C("%s()-%d: RX Warning! bDriverStopped(%d) OR bSurpriseRemoved(%d) bReadPortCancel(%d)\n",
-               __FUNCTION__, __LINE__,padapter->bDriverStopped, padapter->bSurpriseRemoved,padapter->bReadPortCancel);
+               __func__, __LINE__,padapter->bDriverStopped, padapter->bSurpriseRemoved,padapter->bReadPortCancel);
                goto exit;
        }
 
@@ -893,7 +893,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
                        RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete: (purb->actual_length > MAX_RECVBUF_SZ) || (purb->actual_length < RXDESC_SIZE)\n"));
                        precvbuf->reuse = true;
                        rtw_read_port(padapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf);
-                       DBG_8192C("%s()-%d: RX Warning!\n", __FUNCTION__, __LINE__);
+                       DBG_8192C("%s()-%d: RX Warning!\n", __func__, __LINE__);
                }
                else
                {
index f6a25fa..e922201 100755 (executable)
@@ -438,8 +438,8 @@ extern void rtw_usleep_os(int us);
 extern u32     rtw_atoi(u8* s);
 
 #ifdef DBG_DELAY_OS
-#define rtw_mdelay_os(ms) _rtw_mdelay_os((ms), __FUNCTION__, __LINE__)
-#define rtw_udelay_os(ms) _rtw_udelay_os((ms), __FUNCTION__, __LINE__)
+#define rtw_mdelay_os(ms) _rtw_mdelay_os((ms), __func__, __LINE__)
+#define rtw_udelay_os(ms) _rtw_udelay_os((ms), __func__, __LINE__)
 extern void _rtw_mdelay_os(int ms, const char *func, const int line);
 extern void _rtw_udelay_os(int us, const char *func, const int line);
 #else
index 05e096b..6b10e69 100755 (executable)
@@ -1208,7 +1208,7 @@ typedef struct _BTData_ENTRY
 
 #define BTHCI_SM_WITH_INFO(_Adapter, _StateToEnter, _StateCmd, _EntryNum)      \
 {                                                                              \
-       RTPRINT(FIOCTL, IOCTL_STATE, ("[BT state change] caused by ""%s"", line=%d\n", __FUNCTION__, __LINE__));                                                        \
+       RTPRINT(FIOCTL, IOCTL_STATE, ("[BT state change] caused by ""%s"", line=%d\n", __func__, __LINE__));                                                    \
        BTHCI_StateMachine(_Adapter, _StateToEnter, _StateCmd, _EntryNum);\
 }
 
index 176fb47..98c3527 100755 (executable)
        #define _func_enter_ \
        do {    \
                if (GlobalDebugLevel >= _drv_debug_) { \
-                       _dbgdump("\n %s : %s enters at %d\n", DRIVER_PREFIX, __FUNCTION__, __LINE__);\
+                       _dbgdump("\n %s : %s enters at %d\n", DRIVER_PREFIX, __func__, __LINE__);\
                }               \
        } while (0)
 
        #define _func_exit_ \
        do {    \
                if (GlobalDebugLevel >= _drv_debug_) { \
-                       _dbgdump("\n %s : %s exits at %d\n", DRIVER_PREFIX, __FUNCTION__, __LINE__); \
+                       _dbgdump("\n %s : %s exits at %d\n", DRIVER_PREFIX, __func__, __LINE__); \
                }       \
        } while (0)
 
index b6c1805..acb7099 100755 (executable)
@@ -375,17 +375,17 @@ extern int dbg_rtw_write16(_adapter *adapter, u32 addr, u16 val, const char *cal
 extern int dbg_rtw_write32(_adapter *adapter, u32 addr, u32 val, const char *caller, const int line);
 extern int dbg_rtw_writeN(_adapter *adapter, u32 addr ,u32 length , u8 *data, const char *caller, const int line);
 
-#define rtw_read8(adapter, addr) dbg_rtw_read8((adapter), (addr), __FUNCTION__, __LINE__)
-#define rtw_read16(adapter, addr) dbg_rtw_read16((adapter), (addr), __FUNCTION__, __LINE__)
-#define rtw_read32(adapter, addr) dbg_rtw_read32((adapter), (addr), __FUNCTION__, __LINE__)
+#define rtw_read8(adapter, addr) dbg_rtw_read8((adapter), (addr), __func__, __LINE__)
+#define rtw_read16(adapter, addr) dbg_rtw_read16((adapter), (addr), __func__, __LINE__)
+#define rtw_read32(adapter, addr) dbg_rtw_read32((adapter), (addr), __func__, __LINE__)
 #define rtw_read_mem(adapter, addr, cnt, mem) _rtw_read_mem((adapter), (addr), (cnt), (mem))
 #define rtw_read_port(adapter, addr, cnt, mem) _rtw_read_port((adapter), (addr), (cnt), (mem))
 #define rtw_read_port_cancel(adapter) _rtw_read_port_cancel((adapter))
 
-#define  rtw_write8(adapter, addr, val) dbg_rtw_write8((adapter), (addr), (val), __FUNCTION__, __LINE__)
-#define  rtw_write16(adapter, addr, val) dbg_rtw_write16((adapter), (addr), (val), __FUNCTION__, __LINE__)
-#define  rtw_write32(adapter, addr, val) dbg_rtw_write32((adapter), (addr), (val), __FUNCTION__, __LINE__)
-#define  rtw_writeN(adapter, addr, length, data) dbg_rtw_writeN((adapter), (addr), (length), (data), __FUNCTION__, __LINE__)
+#define  rtw_write8(adapter, addr, val) dbg_rtw_write8((adapter), (addr), (val), __func__, __LINE__)
+#define  rtw_write16(adapter, addr, val) dbg_rtw_write16((adapter), (addr), (val), __func__, __LINE__)
+#define  rtw_write32(adapter, addr, val) dbg_rtw_write32((adapter), (addr), (val), __func__, __LINE__)
+#define  rtw_writeN(adapter, addr, length, data) dbg_rtw_writeN((adapter), (addr), (length), (data), __func__, __LINE__)
 
 #define rtw_write8_async(adapter, addr, val) _rtw_write8_async((adapter), (addr), (val))
 #define rtw_write16_async(adapter, addr, val) _rtw_write16_async((adapter), (addr), (val))
index 8c9ab5c..8e261d7 100755 (executable)
@@ -67,7 +67,7 @@
 #define DEBUG_OID(dbg, str)                    \
        if ((!dbg))                                                     \
        {                                                               \
-          RT_TRACE(_module_rtl871x_ioctl_c_,_drv_info_,("%s(%d): %s", __FUNCTION__, __LINE__, str));   \
+          RT_TRACE(_module_rtl871x_ioctl_c_,_drv_info_,("%s(%d): %s", __func__, __LINE__, str));       \
        }
 
 
index e51d575..d074262 100755 (executable)
@@ -75,9 +75,9 @@ int rtw_IOL_exec_empty_cmds_sync(ADAPTER *adapter, u32 max_wating_ms);
 int dbg_rtw_IOL_append_WB_cmd(struct xmit_frame *xmit_frame, u16 addr, u8 value, const char *caller, const int line);
 int dbg_rtw_IOL_append_WW_cmd(struct xmit_frame *xmit_frame, u16 addr, u16 value, const char *caller, const int line);
 int dbg_rtw_IOL_append_WD_cmd(struct xmit_frame *xmit_frame, u16 addr, u32 value, const char *caller, const int line);
-#define rtw_IOL_append_WB_cmd(xmit_frame, addr, value) dbg_rtw_IOL_append_WB_cmd((xmit_frame), (addr), (value), __FUNCTION__, __LINE__)
-#define rtw_IOL_append_WW_cmd(xmit_frame, addr, value) dbg_rtw_IOL_append_WW_cmd((xmit_frame), (addr), (value), __FUNCTION__, __LINE__)
-#define rtw_IOL_append_WD_cmd(xmit_frame, addr, value) dbg_rtw_IOL_append_WD_cmd((xmit_frame), (addr), (value), __FUNCTION__, __LINE__)
+#define rtw_IOL_append_WB_cmd(xmit_frame, addr, value) dbg_rtw_IOL_append_WB_cmd((xmit_frame), (addr), (value), __func__, __LINE__)
+#define rtw_IOL_append_WW_cmd(xmit_frame, addr, value) dbg_rtw_IOL_append_WW_cmd((xmit_frame), (addr), (value), __func__, __LINE__)
+#define rtw_IOL_append_WD_cmd(xmit_frame, addr, value) dbg_rtw_IOL_append_WD_cmd((xmit_frame), (addr), (value), __func__, __LINE__)
 #else
 #define rtw_IOL_append_WB_cmd(xmit_frame, addr, value) _rtw_IOL_append_WB_cmd((xmit_frame), (addr), (value))
 #define rtw_IOL_append_WW_cmd(xmit_frame, addr, value) _rtw_IOL_append_WW_cmd((xmit_frame), (addr), (value))
index fe037d7..aa07abc 100755 (executable)
@@ -665,13 +665,13 @@ void addba_timer_hdl(struct sta_info *psta);
 
 #define set_survey_timer(mlmeext, ms) \
        do { \
-               /*DBG_871X("%s set_survey_timer(%p, %d)\n", __FUNCTION__, (mlmeext), (ms));*/ \
+               /*DBG_871X("%s set_survey_timer(%p, %d)\n", __func__, (mlmeext), (ms));*/ \
                _set_timer(&(mlmeext)->survey_timer, (ms)); \
        } while (0)
 
 #define set_link_timer(mlmeext, ms) \
        do { \
-               /*DBG_871X("%s set_link_timer(%p, %d)\n", __FUNCTION__, (mlmeext), (ms));*/ \
+               /*DBG_871X("%s set_link_timer(%p, %d)\n", __func__, (mlmeext), (ms));*/ \
                _set_timer(&(mlmeext)->link_timer, (ms)); \
        } while (0)
 
index f44fa63..5fa377a 100755 (executable)
@@ -115,10 +115,10 @@ void dbg_rtw_p2p_set_state(struct wifidirect_info *wdinfo, enum P2P_STATE state,
 void dbg_rtw_p2p_set_pre_state(struct wifidirect_info *wdinfo, enum P2P_STATE state, const char *caller, int line);
 //void dbg_rtw_p2p_restore_state(struct wifidirect_info *wdinfo, const char *caller, int line);
 void dbg_rtw_p2p_set_role(struct wifidirect_info *wdinfo, enum P2P_ROLE role, const char *caller, int line);
-#define rtw_p2p_set_state(wdinfo, state) dbg_rtw_p2p_set_state(wdinfo, state, __FUNCTION__, __LINE__)
-#define rtw_p2p_set_pre_state(wdinfo, state) dbg_rtw_p2p_set_pre_state(wdinfo, state, __FUNCTION__, __LINE__)
-#define rtw_p2p_set_role(wdinfo, role) dbg_rtw_p2p_set_role(wdinfo, role, __FUNCTION__, __LINE__)
-//#define rtw_p2p_restore_state(wdinfo) dbg_rtw_p2p_restore_state(wdinfo, __FUNCTION__, __LINE__)
+#define rtw_p2p_set_state(wdinfo, state) dbg_rtw_p2p_set_state(wdinfo, state, __func__, __LINE__)
+#define rtw_p2p_set_pre_state(wdinfo, state) dbg_rtw_p2p_set_pre_state(wdinfo, state, __func__, __LINE__)
+#define rtw_p2p_set_role(wdinfo, role) dbg_rtw_p2p_set_role(wdinfo, role, __func__, __LINE__)
+//#define rtw_p2p_restore_state(wdinfo) dbg_rtw_p2p_restore_state(wdinfo, __func__, __LINE__)
 #else //CONFIG_DBG_P2P
 #define rtw_p2p_set_state(wdinfo, state) _rtw_p2p_set_state(wdinfo, state)
 #define rtw_p2p_set_pre_state(wdinfo, state) _rtw_p2p_set_pre_state(wdinfo, state)
index 954ad54..211bd17 100755 (executable)
@@ -293,7 +293,7 @@ struct pwrctrl_priv
 
 #define _rtw_set_pwr_state_check_timer(pwrctrlpriv, ms) \
        do { \
-               /*DBG_871X("%s _rtw_set_pwr_state_check_timer(%p, %d)\n", __FUNCTION__, (pwrctrlpriv), (ms));*/ \
+               /*DBG_871X("%s _rtw_set_pwr_state_check_timer(%p, %d)\n", __func__, (pwrctrlpriv), (ms));*/ \
                _set_timer(&(pwrctrlpriv)->pwr_state_check_timer, (ms)); \
        } while (0)
 
@@ -352,7 +352,7 @@ void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv);
 
 u8 rtw_interface_ps_func(_adapter *padapter,HAL_INTF_PS_FUNC efunc_id,u8* val);
 int _rtw_pwr_wakeup(_adapter *padapter, u32 ips_deffer_ms, const char *caller);
-#define rtw_pwr_wakeup(adapter) _rtw_pwr_wakeup(adapter, RTW_PWR_STATE_CHK_INTERVAL, __FUNCTION__)
+#define rtw_pwr_wakeup(adapter) _rtw_pwr_wakeup(adapter, RTW_PWR_STATE_CHK_INTERVAL, __func__)
 int rtw_pm_set_ips(_adapter *padapter, u8 mode);
 int rtw_pm_set_lps(_adapter *padapter, u8 mode);
 
index 142a83e..2b1cf82 100755 (executable)
@@ -48,7 +48,7 @@ do { if (wapi_debug_component & (component)) { \
                {                                                                                       \
                        printk("RTWLAN: ");                                     \
                        printk( "Assertion failed! %s,%s,line=%d\n", \
-                       #_Exp,__FUNCTION__,__LINE__);          \
+                       #_Exp,__func__,__LINE__);          \
                        return;                                         \
                }
 #define RT_ASSERT_RET_VALUE(_Exp,Ret)                                                          \
@@ -56,7 +56,7 @@ do { if (wapi_debug_component & (component)) { \
                {                                                                                       \
                        printk("RTWLAN: ");                                     \
                        printk( "Assertion failed! %s,%s,line=%d\n", \
-                       #_Exp,__FUNCTION__,__LINE__);          \
+                       #_Exp,__func__,__LINE__);          \
                        return (Ret);                                           \
                }
 
index 16a7697..f67f5f7 100755 (executable)
@@ -514,7 +514,7 @@ void rtw_cfg80211_indicate_connect(_adapter *padapter)
                notify_channel = ieee80211_get_channel(wiphy, freq);
                #endif
 
-               DBG_871X("%s call cfg80211_roamed\n", __FUNCTION__);
+               DBG_871X("%s call cfg80211_roamed\n", __func__);
                cfg80211_roamed(padapter->pnetdev
                        #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39) || defined(COMPAT_KERNEL_RELEASE)
                        , notify_channel
@@ -639,7 +639,7 @@ static int set_group_key(_adapter *padapter, u8 *key, u8 alg, int keyid)
        struct cmd_priv *pcmdpriv=&(padapter->cmdpriv);
        int res=_SUCCESS;
 
-       DBG_8192C("%s\n", __FUNCTION__);
+       DBG_8192C("%s\n", __func__);
 
        pcmd = (struct cmd_obj*)rtw_zmalloc(sizeof(struct       cmd_obj));
        if (pcmd==NULL) {
@@ -727,7 +727,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa
        struct security_priv* psecuritypriv=&(padapter->securitypriv);
        struct sta_priv *pstapriv = &padapter->stapriv;
 
-       DBG_8192C("%s\n", __FUNCTION__);
+       DBG_8192C("%s\n", __func__);
 
        param->u.crypt.err = 0;
        param->u.crypt.alg[IEEE_CRYPT_ALG_NAME_LEN - 1] = '\0';
@@ -825,7 +825,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa
                {
                        if (strcmp(param->u.crypt.alg, "WEP") == 0)
                        {
-                               DBG_8192C("%s, set group_key, WEP\n", __FUNCTION__);
+                               DBG_8192C("%s, set group_key, WEP\n", __func__);
 
                                memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey,  param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len));
 
@@ -838,7 +838,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa
                        }
                        else if (strcmp(param->u.crypt.alg, "TKIP") == 0)
                        {
-                               DBG_8192C("%s, set group_key, TKIP\n", __FUNCTION__);
+                               DBG_8192C("%s, set group_key, TKIP\n", __func__);
 
                                psecuritypriv->dot118021XGrpPrivacy = _TKIP_;
 
@@ -854,7 +854,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa
                        }
                        else if (strcmp(param->u.crypt.alg, "CCMP") == 0)
                        {
-                               DBG_8192C("%s, set group_key, CCMP\n", __FUNCTION__);
+                               DBG_8192C("%s, set group_key, CCMP\n", __func__);
 
                                psecuritypriv->dot118021XGrpPrivacy = _AES_;
 
@@ -862,7 +862,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa
                        }
                        else
                        {
-                               DBG_8192C("%s, set group_key, none\n", __FUNCTION__);
+                               DBG_8192C("%s, set group_key, none\n", __func__);
 
                                psecuritypriv->dot118021XGrpPrivacy = _NO_PRIVACY_;
                        }
@@ -898,7 +898,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa
 
                                if (strcmp(param->u.crypt.alg, "WEP") == 0)
                                {
-                                       DBG_8192C("%s, set pairwise key, WEP\n", __FUNCTION__);
+                                       DBG_8192C("%s, set pairwise key, WEP\n", __func__);
 
                                        psta->dot118021XPrivacy = _WEP40_;
                                        if (param->u.crypt.key_len==13)
@@ -908,7 +908,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa
                                }
                                else if (strcmp(param->u.crypt.alg, "TKIP") == 0)
                                {
-                                       DBG_8192C("%s, set pairwise key, TKIP\n", __FUNCTION__);
+                                       DBG_8192C("%s, set pairwise key, TKIP\n", __func__);
 
                                        psta->dot118021XPrivacy = _TKIP_;
 
@@ -923,13 +923,13 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa
                                else if (strcmp(param->u.crypt.alg, "CCMP") == 0)
                                {
 
-                                       DBG_8192C("%s, set pairwise key, CCMP\n", __FUNCTION__);
+                                       DBG_8192C("%s, set pairwise key, CCMP\n", __func__);
 
                                        psta->dot118021XPrivacy = _AES_;
                                }
                                else
                                {
-                                       DBG_8192C("%s, set pairwise key, none\n", __FUNCTION__);
+                                       DBG_8192C("%s, set pairwise key, none\n", __func__);
 
                                        psta->dot118021XPrivacy = _NO_PRIVACY_;
                                }
@@ -1665,7 +1665,7 @@ void rtw_cfg80211_indicate_scan_done(struct rtw_wdev_priv *pwdev_priv, bool abor
                //struct cfg80211_scan_request *scan_request = pwdev_priv->scan_request;
 
                #ifdef CONFIG_DEBUG_CFG80211
-               DBG_871X("%s with scan req\n", __FUNCTION__);
+               DBG_871X("%s with scan req\n", __func__);
                #endif
 
                //avoid WARN_ON(request != wiphy_to_dev(request->wiphy)->scan_req);
@@ -1683,7 +1683,7 @@ void rtw_cfg80211_indicate_scan_done(struct rtw_wdev_priv *pwdev_priv, bool abor
 
        } else {
                #ifdef CONFIG_DEBUG_CFG80211
-               DBG_871X("%s without scan req\n", __FUNCTION__);
+               DBG_871X("%s without scan req\n", __func__);
                #endif
        }
        _exit_critical_bh(&pwdev_priv->scan_req_lock, &irqL);
@@ -1774,7 +1774,7 @@ static int rtw_cfg80211_set_probe_req_wpsp2pie(struct net_device *net, char *buf
 
                        pmlmepriv->wps_probe_req_ie = rtw_malloc(wps_ielen);
                        if ( pmlmepriv->wps_probe_req_ie == NULL) {
-                               DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__);
+                               DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__);
                                return -EINVAL;
 
                        }
@@ -1802,7 +1802,7 @@ static int rtw_cfg80211_set_probe_req_wpsp2pie(struct net_device *net, char *buf
 
                        pmlmepriv->p2p_probe_req_ie = rtw_malloc(len);
                        if ( pmlmepriv->p2p_probe_req_ie == NULL) {
-                               DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__);
+                               DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__);
                                return -EINVAL;
 
                        }
@@ -1865,7 +1865,7 @@ if (padapter->registrypriv.mp_mode == 1)
        {
 
 #ifdef CONFIG_DEBUG_CFG80211
-               DBG_871X("%s under WIFI_AP_STATE\n", __FUNCTION__);
+               DBG_871X("%s under WIFI_AP_STATE\n", __func__);
 #endif
                //need_indicate_scan_done = true;
                //goto check_need_indicate_scan_done;
@@ -1990,7 +1990,7 @@ if (padapter->registrypriv.mp_mode == 1)
 
 #ifdef CONFIG_DEBUG_CFG80211
        //parsing channels, n_channels
-       DBG_871X("%s n_channels:%u\n", __FUNCTION__, request->n_channels);
+       DBG_871X("%s n_channels:%u\n", __func__, request->n_channels);
 #endif
 
        _enter_critical_bh(&pmlmepriv->lock, &irqL);
@@ -2324,7 +2324,7 @@ static int rtw_cfg80211_set_wpa_ie(_adapter *padapter, u8 *pie, size_t ielen)
                if ((p2p_ie=rtw_get_p2p_ie(buf, ielen, NULL, &p2p_ielen)))
                {
                        #ifdef CONFIG_DEBUG_CFG80211
-                       DBG_8192C("%s p2p_assoc_req_ielen=%d\n", __FUNCTION__, p2p_ielen);
+                       DBG_8192C("%s p2p_assoc_req_ielen=%d\n", __func__, p2p_ielen);
                        #endif
 
                        if (pmlmepriv->p2p_assoc_req_ie)
@@ -2337,7 +2337,7 @@ static int rtw_cfg80211_set_wpa_ie(_adapter *padapter, u8 *pie, size_t ielen)
 
                        pmlmepriv->p2p_assoc_req_ie = rtw_malloc(p2p_ielen);
                        if ( pmlmepriv->p2p_assoc_req_ie == NULL) {
-                               DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__);
+                               DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__);
                                goto exit;
                        }
                        memcpy(pmlmepriv->p2p_assoc_req_ie, p2p_ie, p2p_ielen);
@@ -2385,7 +2385,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,
        if (wdev_to_priv(padapter->rtw_wdev)->block == true)
        {
                ret = -EBUSY;
-               DBG_871X("%s wdev_priv.block is set\n", __FUNCTION__);
+               DBG_871X("%s wdev_priv.block is set\n", __func__);
                goto exit;
        }
 
@@ -2402,7 +2402,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,
 #ifdef CONFIG_CONCURRENT_MODE
        if (check_buddy_fwstate(padapter, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == true)
        {
-               DBG_8192C("%s, but buddy_intf is under scanning or linking\n", __FUNCTION__);
+               DBG_8192C("%s, but buddy_intf is under scanning or linking\n", __func__);
 
                ret = -EINVAL;
 
@@ -2437,7 +2437,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,
        if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == true)
        {
                ret = -EBUSY;
-               DBG_8192C("%s, fw_state=0x%x, goto exit\n", __FUNCTION__, pmlmepriv->fw_state);
+               DBG_8192C("%s, fw_state=0x%x, goto exit\n", __func__, pmlmepriv->fw_state);
                goto exit;
        }
 
@@ -2569,7 +2569,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,
        {
                u32 wep_key_idx, wep_key_len,wep_total_len;
                NDIS_802_11_WEP  *pwep = NULL;
-               DBG_871X("%s(): Shared/Auto WEP\n",__FUNCTION__);
+               DBG_871X("%s(): Shared/Auto WEP\n",__func__);
 
                wep_key_idx = sme->key_idx;
                wep_key_len = sme->key_len;
@@ -2666,7 +2666,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,
 
 exit:
 
-       DBG_8192C("<=%s, ret %d\n",__FUNCTION__, ret);
+       DBG_8192C("<=%s, ret %d\n",__func__, ret);
 
        return ret;
 }
@@ -2682,7 +2682,7 @@ static int cfg80211_rtw_disconnect(struct wiphy *wiphy, struct net_device *ndev,
        {
                rtw_disassoc_cmd(padapter);
 
-               DBG_871X("%s...call rtw_indicate_disconnect\n ", __FUNCTION__);
+               DBG_871X("%s...call rtw_indicate_disconnect\n ", __func__);
 
                padapter->mlmepriv.not_indic_disco = true;
                rtw_indicate_disconnect(padapter);
@@ -3290,7 +3290,7 @@ static int rtw_add_beacon(_adapter *adapter, const u8 *head, size_t head_len, co
        //struct sta_priv *pstapriv = &padapter->stapriv;
 
 
-       DBG_8192C("%s beacon_head_len=%zu, beacon_tail_len=%zu\n", __FUNCTION__, head_len, tail_len);
+       DBG_8192C("%s beacon_head_len=%zu, beacon_tail_len=%zu\n", __func__, head_len, tail_len);
 
 
        if (check_fwstate(pmlmepriv, WIFI_AP_STATE) != true)
@@ -3720,7 +3720,7 @@ void rtw_cfg80211_issue_p2p_provision_request(_adapter *padapter, const u8 *buf,
        size_t frame_body_len = len - sizeof(struct rtw_ieee80211_hdr_3addr);
 
 
-       DBG_871X( "[%s] In\n", __FUNCTION__ );
+       DBG_871X( "[%s] In\n", __func__ );
 
        //prepare for building provision_request frame
        memcpy(pwdinfo->tx_prov_disc_info.peerIFAddr, GetAddr1Ptr(buf), ETH_ALEN);
@@ -4009,7 +4009,7 @@ static s32 cfg80211_rtw_remain_on_channel(struct wiphy *wiphy, struct net_device
                        //set_channel_bwmode(padapter, remain_ch, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20);
                }
        } else {
-               DBG_871X("%s remain_ch:%u not in channel plan!!!!\n", __FUNCTION__, remain_ch);
+               DBG_871X("%s remain_ch:%u not in channel plan!!!!\n", __func__, remain_ch);
        }
 
 
@@ -4605,7 +4605,7 @@ static int rtw_cfg80211_set_beacon_wpsp2pie(struct net_device *ndev, char *buf,
 
                        pmlmepriv->wps_beacon_ie = rtw_malloc(wps_ielen);
                        if ( pmlmepriv->wps_beacon_ie == NULL) {
-                               DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__);
+                               DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__);
                                return -EINVAL;
 
                        }
@@ -4637,7 +4637,7 @@ static int rtw_cfg80211_set_beacon_wpsp2pie(struct net_device *ndev, char *buf,
 
                        pmlmepriv->p2p_beacon_ie = rtw_malloc(p2p_ielen);
                        if ( pmlmepriv->p2p_beacon_ie == NULL) {
-                               DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__);
+                               DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__);
                                return -EINVAL;
 
                        }
@@ -4691,7 +4691,7 @@ static int rtw_cfg80211_set_probe_resp_wpsp2pie(struct net_device *net, char *bu
 
                        pmlmepriv->wps_probe_resp_ie = rtw_malloc(wps_ielen);
                        if ( pmlmepriv->wps_probe_resp_ie == NULL) {
-                               DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__);
+                               DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__);
                                return -EINVAL;
 
                        }
@@ -4732,7 +4732,7 @@ static int rtw_cfg80211_set_probe_resp_wpsp2pie(struct net_device *net, char *bu
                        if ( rtw_get_p2p_attr_content( p2p_ie, p2p_ielen, P2P_ATTR_CAPABILITY, (u8*)&cap_attr, (uint*) &attr_contentlen) )
                        {
                                u8 grp_cap=0;
-                               //DBG_8192C( "[%s] Got P2P Capability Attr!!\n", __FUNCTION__ );
+                               //DBG_8192C( "[%s] Got P2P Capability Attr!!\n", __func__ );
                                cap_attr = le16_to_cpu(cap_attr);
                                grp_cap = (u8)((cap_attr >> 8)&0xff);
 
@@ -4755,7 +4755,7 @@ static int rtw_cfg80211_set_probe_resp_wpsp2pie(struct net_device *net, char *bu
 
                                pmlmepriv->p2p_probe_resp_ie = rtw_malloc(p2p_ielen);
                                if ( pmlmepriv->p2p_probe_resp_ie == NULL) {
-                                       DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__);
+                                       DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__);
                                        return -EINVAL;
 
                                }
@@ -4774,7 +4774,7 @@ static int rtw_cfg80211_set_probe_resp_wpsp2pie(struct net_device *net, char *bu
 
                                pmlmepriv->p2p_go_probe_resp_ie = rtw_malloc(p2p_ielen);
                                if ( pmlmepriv->p2p_go_probe_resp_ie == NULL) {
-                                       DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__);
+                                       DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__);
                                        return -EINVAL;
 
                                }
@@ -4811,7 +4811,7 @@ static int rtw_cfg80211_set_assoc_resp_wpsp2pie(struct net_device *net, char *bu
 
                pmlmepriv->wps_assoc_resp_ie = rtw_malloc(len);
                if ( pmlmepriv->wps_assoc_resp_ie == NULL) {
-                       DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__);
+                       DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__);
                        return -EINVAL;
 
                }
index 18c3bf3..d39dc6f 100644 (file)
@@ -139,7 +139,7 @@ static void indicate_wx_custom_event(_adapter *padapter, char *msg)
        union iwreq_data wrqu;
 
        if (strlen(msg) > IW_CUSTOM_MAX) {
-               DBG_871X("%s strlen(msg):%zu > IW_CUSTOM_MAX:%u\n", __FUNCTION__ , strlen(msg), IW_CUSTOM_MAX);
+               DBG_871X("%s strlen(msg):%zu > IW_CUSTOM_MAX:%u\n", __func__ , strlen(msg), IW_CUSTOM_MAX);
                return;
        }
 
@@ -152,7 +152,7 @@ static void indicate_wx_custom_event(_adapter *padapter, char *msg)
        memset(&wrqu,0,sizeof(wrqu));
        wrqu.data.length = strlen(msg);
 
-       DBG_871X("%s %s\n", __FUNCTION__, buff);
+       DBG_871X("%s %s\n", __func__, buff);
 #ifndef CONFIG_IOCTL_CFG80211
        wireless_send_event(padapter->pnetdev, IWEVCUSTOM, &wrqu, buff);
 #endif
@@ -184,7 +184,7 @@ static void request_wps_pbc_event(_adapter *padapter)
 
        wrqu.data.length = (wrqu.data.length<IW_CUSTOM_MAX) ? wrqu.data.length:IW_CUSTOM_MAX;
 
-       DBG_871X("%s\n", __FUNCTION__);
+       DBG_871X("%s\n", __func__);
 
 #ifndef CONFIG_IOCTL_CFG80211
        wireless_send_event(padapter->pnetdev, IWEVCUSTOM, &wrqu, buff);
@@ -1695,12 +1695,12 @@ static int rtw_wx_set_mlme(struct net_device *dev,
        if (mlme==NULL)
                return -1;
 
-       DBG_871X("%s\n", __FUNCTION__);
+       DBG_871X("%s\n", __func__);
 
        reason = cpu_to_le16(mlme->reason_code);
 
 
-       DBG_871X("%s, cmd=%d, reason=%d\n", __FUNCTION__, mlme->cmd, reason);
+       DBG_871X("%s, cmd=%d, reason=%d\n", __func__, mlme->cmd, reason);
 
 
        switch (mlme->cmd)
@@ -1740,7 +1740,7 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a,
 _func_enter_;
 
        #ifdef DBG_IOCTL
-       DBG_871X("DBG_IOCTL %s:%d\n",__FUNCTION__, __LINE__);
+       DBG_871X("DBG_IOCTL %s:%d\n",__func__, __LINE__);
        #endif
 /*
 #ifdef CONFIG_CONCURRENT_MODE
@@ -1891,7 +1891,7 @@ if (padapter->registrypriv.mp_mode == 1)
                char sec_len;
                int ssid_index = 0;
 
-               //DBG_871X("%s COMBO_SCAN header is recognized\n", __FUNCTION__);
+               //DBG_871X("%s COMBO_SCAN header is recognized\n", __func__);
 
                while (len >= 1) {
                        section = *(pos++); len-=1;
@@ -1909,7 +1909,7 @@ if (padapter->registrypriv.mp_mode == 1)
                                        if (sec_len>0 && sec_len<=len) {
                                                ssid[ssid_index].SsidLength = sec_len;
                                                memcpy(ssid[ssid_index].Ssid, pos, ssid[ssid_index].SsidLength);
-                                               //DBG_871X("%s COMBO_SCAN with specific ssid:%s, %d\n", __FUNCTION__
+                                               //DBG_871X("%s COMBO_SCAN with specific ssid:%s, %d\n", __func__
                                                //      , ssid[ssid_index].Ssid, ssid[ssid_index].SsidLength);
                                                ssid_index++;
                                        }
@@ -1958,7 +1958,7 @@ if (padapter->registrypriv.mp_mode == 1)
 
 exit:
        #ifdef DBG_IOCTL
-       DBG_871X("DBG_IOCTL %s:%d return %d\n",__FUNCTION__, __LINE__, ret);
+       DBG_871X("DBG_IOCTL %s:%d return %d\n",__func__, __LINE__, ret);
        #endif
 
 _func_exit_;
@@ -1994,7 +1994,7 @@ static int rtw_wx_get_scan(struct net_device *dev, struct iw_request_info *a,
        _func_enter_;
 
        #ifdef DBG_IOCTL
-       DBG_871X("DBG_IOCTL %s:%d\n",__FUNCTION__, __LINE__);
+       DBG_871X("DBG_IOCTL %s:%d\n",__func__, __LINE__);
        #endif
 
 /*
@@ -2109,7 +2109,7 @@ exit:
        _func_exit_;
 
        #ifdef DBG_IOCTL
-       DBG_871X("DBG_IOCTL %s:%d return %d\n",__FUNCTION__, __LINE__, ret);
+       DBG_871X("DBG_IOCTL %s:%d return %d\n",__func__, __LINE__, ret);
        #endif
 
        return ret ;
@@ -2142,7 +2142,7 @@ static int rtw_wx_set_essid(struct net_device *dev,
        _func_enter_;
 
        #ifdef DBG_IOCTL
-       DBG_871X("DBG_IOCTL %s:%d\n",__FUNCTION__, __LINE__);
+       DBG_871X("DBG_IOCTL %s:%d\n",__func__, __LINE__);
        #endif
 
 /*
@@ -2203,7 +2203,7 @@ static int rtw_wx_set_essid(struct net_device *dev,
        }
 
        authmode = padapter->securitypriv.ndisauthtype;
-       DBG_871X("=>%s\n",__FUNCTION__);
+       DBG_871X("=>%s\n",__func__);
        if (wrqu->essid.flags && wrqu->essid.length)
        {
                // Commented by Albert 20100519
@@ -2288,10 +2288,10 @@ static int rtw_wx_set_essid(struct net_device *dev,
 
 exit:
 
-       DBG_871X("<=%s, ret %d\n",__FUNCTION__, ret);
+       DBG_871X("<=%s, ret %d\n",__func__, ret);
 
        #ifdef DBG_IOCTL
-       DBG_871X("DBG_IOCTL %s:%d return %d\n",__FUNCTION__, __LINE__, ret);
+       DBG_871X("DBG_IOCTL %s:%d return %d\n",__func__, __LINE__, ret);
        #endif
 
        _func_exit_;
@@ -2905,7 +2905,7 @@ static int rtw_wx_set_auth(struct net_device *dev,
                */
                if (check_fwstate(&padapter->mlmepriv, _FW_LINKED)) {
                        rtw_disassoc_cmd(padapter);
-                       DBG_871X("%s...call rtw_indicate_disconnect\n ",__FUNCTION__);
+                       DBG_871X("%s...call rtw_indicate_disconnect\n ",__func__);
                        rtw_indicate_disconnect(padapter);
                        rtw_free_assoc_resources(padapter, 1);
                }
@@ -3377,7 +3377,7 @@ static void rtw_dbg_mode_hdl(_adapter *padapter, u32 id, u8 *pdata, u32 len)
        u8 offset;
        u32 value;
 
-       DBG_871X("%s\n", __FUNCTION__);
+       DBG_871X("%s\n", __func__);
 
        switch (id)
        {
@@ -3725,10 +3725,10 @@ static int rtw_set_pid(struct net_device *dev,
                #ifdef CONFIG_GLOBAL_UI_PID
                ui_pid[selector] = *(pdata+1);
                #endif
-               DBG_871X("%s set pid[%d]=%d\n", __FUNCTION__, selector ,padapter->pid[selector]);
+               DBG_871X("%s set pid[%d]=%d\n", __func__, selector ,padapter->pid[selector]);
        }
        else
-               DBG_871X("%s selector %d error\n", __FUNCTION__, selector);
+               DBG_871X("%s selector %d error\n", __func__, selector);
 
 exit:
 
@@ -3760,7 +3760,7 @@ static int rtw_wps_start(struct net_device *dev,
                u32wps_start = *extra;
        }
 
-       DBG_871X( "[%s] wps_start = %d\n", __FUNCTION__, u32wps_start );
+       DBG_871X( "[%s] wps_start = %d\n", __func__, u32wps_start );
 
        if ( u32wps_start == 1 ) // WPS Start
        {
@@ -3877,7 +3877,7 @@ static int rtw_p2p_set_go_nego_ssid(struct net_device *dev,
        struct iw_point *pdata = &wrqu->data;
        struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
 
-       DBG_871X( "[%s] ssid = %s, len = %zu\n", __FUNCTION__, extra, strlen( extra ) );
+       DBG_871X( "[%s] ssid = %s, len = %zu\n", __func__, extra, strlen( extra ) );
        memcpy( pwdinfo->nego_ssid, extra, strlen( extra ) );
        pwdinfo->nego_ssidlen = strlen( extra );
 
@@ -3918,7 +3918,7 @@ static int rtw_p2p_set_intent(struct net_device *dev,
                ret = -1;
        }
 
-       DBG_871X( "[%s] intent = %d\n", __FUNCTION__, intent);
+       DBG_871X( "[%s] intent = %d\n", __func__, intent);
 
        return ret;
 
@@ -3958,7 +3958,7 @@ static int rtw_p2p_set_listen_ch(struct net_device *dev,
                ret = -1;
        }
 
-       DBG_871X( "[%s] listen_ch = %d\n", __FUNCTION__, pwdinfo->listen_channel );
+       DBG_871X( "[%s] listen_ch = %d\n", __func__, pwdinfo->listen_channel );
 
        return ret;
 
@@ -3999,7 +3999,7 @@ static int rtw_p2p_set_op_ch(struct net_device *dev,
                ret = -1;
        }
 
-       DBG_871X( "[%s] op_ch = %d\n", __FUNCTION__, pwdinfo->operating_channel );
+       DBG_871X( "[%s] op_ch = %d\n", __func__, pwdinfo->operating_channel );
 
        return ret;
 
@@ -4025,7 +4025,7 @@ static int rtw_p2p_profilefound(struct net_device *dev,
        //      YY => SSID Length
        //      SSID => SSID for persistence group
 
-       DBG_871X( "[%s] In value = %s, len = %d\n", __FUNCTION__, extra, wrqu->data.length -1);
+       DBG_871X( "[%s] In value = %s, len = %d\n", __func__, extra, wrqu->data.length -1);
 
 
        //      The upper application should pass the SSID to driver by using this rtw_p2p_profilefound function.
@@ -4075,7 +4075,7 @@ static int rtw_p2p_setDN(struct net_device *dev,
        struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
 
 
-       DBG_871X( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length -1  );
+       DBG_871X( "[%s] %s %d\n", __func__, extra, wrqu->data.length -1  );
        pwdinfo->device_name_len = wrqu->data.length - 1;
        memset( pwdinfo->device_name, 0x00, WPS_MAX_DEVICE_NAME_LEN );
        memcpy( pwdinfo->device_name, extra, pwdinfo->device_name_len );
@@ -4101,7 +4101,7 @@ static int rtw_p2p_get_status(struct net_device *dev,
        struct mlme_ext_priv    *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv;
 #endif
 
-       DBG_871X( "[%s] Role = %d, Status = %d, peer addr = %.2X:%.2X:%.2X:%.2X:%.2X:%.2X\n", __FUNCTION__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo),
+       DBG_871X( "[%s] Role = %d, Status = %d, peer addr = %.2X:%.2X:%.2X:%.2X:%.2X:%.2X\n", __func__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo),
                        pwdinfo->p2p_peer_interface_addr[ 0 ], pwdinfo->p2p_peer_interface_addr[ 1 ], pwdinfo->p2p_peer_interface_addr[ 2 ],
                        pwdinfo->p2p_peer_interface_addr[ 3 ], pwdinfo->p2p_peer_interface_addr[ 4 ], pwdinfo->p2p_peer_interface_addr[ 5 ]);
 
@@ -4148,7 +4148,7 @@ static int rtw_p2p_get_role(struct net_device *dev,
        struct wifidirect_info  *pwdinfo = &( padapter->wdinfo );
 
 
-       DBG_871X( "[%s] Role = %d, Status = %d, peer addr = %.2X:%.2X:%.2X:%.2X:%.2X:%.2X\n", __FUNCTION__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo),
+       DBG_871X( "[%s] Role = %d, Status = %d, peer addr = %.2X:%.2X:%.2X:%.2X:%.2X:%.2X\n", __func__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo),
                        pwdinfo->p2p_peer_interface_addr[ 0 ], pwdinfo->p2p_peer_interface_addr[ 1 ], pwdinfo->p2p_peer_interface_addr[ 2 ],
                        pwdinfo->p2p_peer_interface_addr[ 3 ], pwdinfo->p2p_peer_interface_addr[ 4 ], pwdinfo->p2p_peer_interface_addr[ 5 ]);
 
@@ -4170,7 +4170,7 @@ static int rtw_p2p_get_peer_ifaddr(struct net_device *dev,
        struct wifidirect_info  *pwdinfo = &( padapter->wdinfo );
 
 
-       DBG_871X( "[%s] Role = %d, Status = %d, peer addr = %.2X:%.2X:%.2X:%.2X:%.2X:%.2X\n", __FUNCTION__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo),
+       DBG_871X( "[%s] Role = %d, Status = %d, peer addr = %.2X:%.2X:%.2X:%.2X:%.2X:%.2X\n", __func__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo),
                        pwdinfo->p2p_peer_interface_addr[ 0 ], pwdinfo->p2p_peer_interface_addr[ 1 ], pwdinfo->p2p_peer_interface_addr[ 2 ],
                        pwdinfo->p2p_peer_interface_addr[ 3 ], pwdinfo->p2p_peer_interface_addr[ 4 ], pwdinfo->p2p_peer_interface_addr[ 5 ]);
 
@@ -4193,7 +4193,7 @@ static int rtw_p2p_get_peer_devaddr(struct net_device *dev,
        struct iw_point *pdata = &wrqu->data;
        struct wifidirect_info  *pwdinfo = &( padapter->wdinfo );
 
-       DBG_871X( "[%s] Role = %d, Status = %d, peer addr = %.2X:%.2X:%.2X:%.2X:%.2X:%.2X\n", __FUNCTION__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo),
+       DBG_871X( "[%s] Role = %d, Status = %d, peer addr = %.2X:%.2X:%.2X:%.2X:%.2X:%.2X\n", __func__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo),
                        pwdinfo->rx_prov_disc_info.peerDevAddr[ 0 ], pwdinfo->rx_prov_disc_info.peerDevAddr[ 1 ],
                        pwdinfo->rx_prov_disc_info.peerDevAddr[ 2 ], pwdinfo->rx_prov_disc_info.peerDevAddr[ 3 ],
                        pwdinfo->rx_prov_disc_info.peerDevAddr[ 4 ], pwdinfo->rx_prov_disc_info.peerDevAddr[ 5 ]);
@@ -4217,7 +4217,7 @@ static int rtw_p2p_get_peer_devaddr_by_invitation(struct net_device *dev,
        struct iw_point *pdata = &wrqu->data;
        struct wifidirect_info  *pwdinfo = &( padapter->wdinfo );
 
-       DBG_871X( "[%s] Role = %d, Status = %d, peer addr = %.2X:%.2X:%.2X:%.2X:%.2X:%.2X\n", __FUNCTION__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo),
+       DBG_871X( "[%s] Role = %d, Status = %d, peer addr = %.2X:%.2X:%.2X:%.2X:%.2X:%.2X\n", __func__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo),
                        pwdinfo->p2p_peer_device_addr[ 0 ], pwdinfo->p2p_peer_device_addr[ 1 ],
                        pwdinfo->p2p_peer_device_addr[ 2 ], pwdinfo->p2p_peer_device_addr[ 3 ],
                        pwdinfo->p2p_peer_device_addr[ 4 ], pwdinfo->p2p_peer_device_addr[ 5 ]);
@@ -4263,7 +4263,7 @@ static int rtw_p2p_get_op_ch(struct net_device *dev,
        struct wifidirect_info  *pwdinfo = &( padapter->wdinfo );
 
 
-       DBG_871X( "[%s] Op_ch = %02x\n", __FUNCTION__, pwdinfo->operating_channel);
+       DBG_871X( "[%s] Op_ch = %02x\n", __func__, pwdinfo->operating_channel);
 
        sprintf( extra, "\n\nOp_ch=%.2d\n", pwdinfo->operating_channel );
        wrqu->data.length = strlen( extra );
@@ -4299,7 +4299,7 @@ static int rtw_p2p_get_wps_configmethod(struct net_device *dev,
        //      After knowing its WPS config method, the application can decide the config method for provisioning discovery.
        //      Format: iwpriv wlanx p2p_get_wpsCM 00:E0:4C:00:00:05
 
-       DBG_871X( "[%s] data = %s\n", __FUNCTION__, ( char* ) extra );
+       DBG_871X( "[%s] data = %s\n", __func__, ( char* ) extra );
        if ( copy_from_user(peerMACStr, wrqu->data.pointer + 6 , 17) ) {
                return -EFAULT;
        }
@@ -4372,10 +4372,10 @@ static int rtw_p2p_get_peer_wfd_port(struct net_device *dev,
        struct iw_point *pdata = &wrqu->data;
        struct wifidirect_info  *pwdinfo = &( padapter->wdinfo );
 
-       DBG_871X( "[%s] p2p_state = %d\n", __FUNCTION__, rtw_p2p_state(pwdinfo) );
+       DBG_871X( "[%s] p2p_state = %d\n", __func__, rtw_p2p_state(pwdinfo) );
 
        sprintf( extra, "\n\nPort=%d\n", pwdinfo->wfd_info->peer_rtsp_ctrlport );
-       DBG_871X( "[%s] remote port = %d\n", __FUNCTION__, pwdinfo->wfd_info->peer_rtsp_ctrlport );
+       DBG_871X( "[%s] remote port = %d\n", __func__, pwdinfo->wfd_info->peer_rtsp_ctrlport );
 
        wrqu->data.length = strlen( extra );
        return ret;
@@ -4393,7 +4393,7 @@ static int rtw_p2p_get_peer_wfd_preferred_connection(struct net_device *dev,
        struct wifidirect_info  *pwdinfo = &( padapter->wdinfo );
 
        sprintf( extra, "\n\nwfd_pc=%d\n", pwdinfo->wfd_info->wfd_pc );
-       DBG_871X( "[%s] wfd_pc = %d\n", __FUNCTION__, pwdinfo->wfd_info->wfd_pc );
+       DBG_871X( "[%s] wfd_pc = %d\n", __func__, pwdinfo->wfd_info->wfd_pc );
 
        wrqu->data.length = strlen( extra );
        pwdinfo->wfd_info->wfd_pc = false;      //      Reset the WFD preferred connection to P2P
@@ -4412,7 +4412,7 @@ static int rtw_p2p_get_peer_wfd_session_available(struct net_device *dev,
        struct wifidirect_info  *pwdinfo = &( padapter->wdinfo );
 
        sprintf( extra, "\n\nwfd_sa=%d\n", pwdinfo->wfd_info->peer_session_avail );
-       DBG_871X( "[%s] wfd_sa = %d\n", __FUNCTION__, pwdinfo->wfd_info->peer_session_avail );
+       DBG_871X( "[%s] wfd_sa = %d\n", __func__, pwdinfo->wfd_info->peer_session_avail );
 
        wrqu->data.length = strlen( extra );
        pwdinfo->wfd_info->peer_session_avail = true;   //      Reset the WFD session available
@@ -4449,7 +4449,7 @@ static int rtw_p2p_get_device_name(struct net_device *dev,
        //      Such user interface could show peer device's device name instead of ssid.
        //      Format: iwpriv wlanx p2p_get_wpsCM 00:E0:4C:00:00:05
 
-       DBG_871X( "[%s] data = %s\n", __FUNCTION__, ( char* ) extra );
+       DBG_871X( "[%s] data = %s\n", __func__, ( char* ) extra );
        if ( copy_from_user(peerMACStr, wrqu->data.pointer + 5 , 17) ) {
                return -EFAULT;
        }
@@ -4538,11 +4538,11 @@ static int rtw_p2p_connect(struct net_device *dev,
        //      Format: 00:E0:4C:00:00:05
        //      Format: 00:E0:4C:00:00:05
 
-       DBG_871X( "[%s] data = %s\n", __FUNCTION__, extra );
+       DBG_871X( "[%s] data = %s\n", __func__, extra );
 
        if ( pwdinfo->p2p_state == P2P_STATE_NONE )
        {
-               DBG_871X( "[%s] WiFi Direct is disable!\n", __FUNCTION__ );
+               DBG_871X( "[%s] WiFi Direct is disable!\n", __func__ );
                return ret;
        }
 
@@ -4608,7 +4608,7 @@ static int rtw_p2p_connect(struct net_device *dev,
                }
 #endif // CONFIG_CONCURRENT_MODE
 
-               DBG_871X( "[%s] Start PreTx Procedure!\n", __FUNCTION__ );
+               DBG_871X( "[%s] Start PreTx Procedure!\n", __func__ );
                _set_timer( &pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT );
 #ifdef CONFIG_CONCURRENT_MODE
                if ( check_fwstate( pbuddy_mlmepriv, _FW_LINKED ) )
@@ -4626,7 +4626,7 @@ static int rtw_p2p_connect(struct net_device *dev,
        }
        else
        {
-               DBG_871X( "[%s] Not Found in Scanning Queue~\n", __FUNCTION__ );
+               DBG_871X( "[%s] Not Found in Scanning Queue~\n", __func__ );
                ret = -1;
        }
 exit:
@@ -4671,17 +4671,17 @@ static int rtw_p2p_invite_req(struct net_device *dev,
        //      Command line sample: iwpriv wlan0 p2p_set invite="00:11:22:33:44:55 00:E0:4C:00:00:05 DIRECT-xy"
        //      Format: 00:11:22:33:44:55 00:E0:4C:00:00:05 DIRECT-xy
 
-       DBG_871X( "[%s] data = %s\n", __FUNCTION__, extra );
+       DBG_871X( "[%s] data = %s\n", __func__, extra );
 
        if ( wrqu->data.length <=  37 )
        {
-               DBG_871X( "[%s] Wrong format!\n", __FUNCTION__ );
+               DBG_871X( "[%s] Wrong format!\n", __func__ );
                return ret;
        }
 
        if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
        {
-               DBG_871X( "[%s] WiFi Direct is disable!\n", __FUNCTION__ );
+               DBG_871X( "[%s] WiFi Direct is disable!\n", __func__ );
                return ret;
        }
        else
@@ -4760,7 +4760,7 @@ static int rtw_p2p_invite_req(struct net_device *dev,
                        u8      wfd_devinfo[ 6 ] = { 0x00 };
                        uint    wfd_devlen = 6;
 
-                       DBG_871X( "[%s] Found WFD IE!\n", __FUNCTION__ );
+                       DBG_871X( "[%s] Found WFD IE!\n", __func__ );
                        if ( rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, wfd_devinfo, &wfd_devlen ) )
                        {
                                u16     wfd_devinfo_field = 0;
@@ -4782,7 +4782,7 @@ static int rtw_p2p_invite_req(struct net_device *dev,
 
                if ( false == pwfd_info->peer_session_avail )
                {
-                       DBG_871X( "[%s] WFD Session not avaiable!\n", __FUNCTION__ );
+                       DBG_871X( "[%s] WFD Session not avaiable!\n", __func__ );
                        goto exit;
                }
        }
@@ -4847,7 +4847,7 @@ static int rtw_p2p_invite_req(struct net_device *dev,
        }
        else
        {
-               DBG_871X( "[%s] NOT Found in the Scanning Queue!\n", __FUNCTION__ );
+               DBG_871X( "[%s] NOT Found in the Scanning Queue!\n", __func__ );
        }
 exit:
 
@@ -4891,11 +4891,11 @@ static int rtw_p2p_set_persistent(struct net_device *dev,
        //      0: disable persistent group functionality
        //      1: enable persistent group founctionality
 
-       DBG_871X( "[%s] data = %s\n", __FUNCTION__, extra );
+       DBG_871X( "[%s] data = %s\n", __func__, extra );
 
        if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
        {
-               DBG_871X( "[%s] WiFi Direct is disable!\n", __FUNCTION__ );
+               DBG_871X( "[%s] WiFi Direct is disable!\n", __func__ );
                return ret;
        }
        else
@@ -4913,7 +4913,7 @@ static int rtw_p2p_set_persistent(struct net_device *dev,
                        pwdinfo->persistent_supported = false;
                }
        }
-       printk( "[%s] persistent_supported = %d\n", __FUNCTION__, pwdinfo->persistent_supported );
+       printk( "[%s] persistent_supported = %d\n", __func__, pwdinfo->persistent_supported );
 
 exit:
 
@@ -4955,11 +4955,11 @@ static int rtw_p2p_set_pc(struct net_device *dev,
        //      1. Input information is the MAC address which wants to know the Preferred Connection bit (PC bit)
        //      Format: 00:E0:4C:00:00:05
 
-       DBG_871X( "[%s] data = %s\n", __FUNCTION__, extra );
+       DBG_871X( "[%s] data = %s\n", __func__, extra );
 
        if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
        {
-               DBG_871X( "[%s] WiFi Direct is disable!\n", __FUNCTION__ );
+               DBG_871X( "[%s] WiFi Direct is disable!\n", __func__ );
                return ret;
        }
 
@@ -4988,11 +4988,11 @@ static int rtw_p2p_set_pc(struct net_device *dev,
                {
                        //      The P2P Device ID attribute is included in the Beacon frame.
                        //      The P2P Device Info attribute is included in the probe response frame.
-                       printk( "[%s] Got P2P IE\n", __FUNCTION__ );
+                       printk( "[%s] Got P2P IE\n", __func__ );
                        if ( rtw_get_p2p_attr_content( p2pie, p2pielen, P2P_ATTR_DEVICE_ID, attr_content, &attr_contentlen) )
                        {
                                //      Handle the P2P Device ID attribute of Beacon first
-                               printk( "[%s] P2P_ATTR_DEVICE_ID\n", __FUNCTION__ );
+                               printk( "[%s] P2P_ATTR_DEVICE_ID\n", __func__ );
                                if ( _rtw_memcmp( attr_content, peerMAC, ETH_ALEN ) )
                                {
                                        uintPeerChannel = pnetwork->network.Configuration.DSConfig;
@@ -5002,7 +5002,7 @@ static int rtw_p2p_set_pc(struct net_device *dev,
                        else if ( rtw_get_p2p_attr_content( p2pie, p2pielen, P2P_ATTR_DEVICE_INFO, attr_content, &attr_contentlen) )
                        {
                                //      Handle the P2P Device Info attribute of probe response
-                               printk( "[%s] P2P_ATTR_DEVICE_INFO\n", __FUNCTION__ );
+                               printk( "[%s] P2P_ATTR_DEVICE_INFO\n", __func__ );
                                if ( _rtw_memcmp( attr_content, peerMAC, ETH_ALEN ) )
                                {
                                        uintPeerChannel = pnetwork->network.Configuration.DSConfig;
@@ -5017,7 +5017,7 @@ static int rtw_p2p_set_pc(struct net_device *dev,
        }
 
        _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
-       printk( "[%s] channel = %d\n", __FUNCTION__, uintPeerChannel );
+       printk( "[%s] channel = %d\n", __func__, uintPeerChannel );
 #ifdef CONFIG_WFD
        if ( uintPeerChannel )
        {
@@ -5029,7 +5029,7 @@ static int rtw_p2p_set_pc(struct net_device *dev,
                        u8      wfd_devinfo[ 6 ] = { 0x00 };
                        uint    wfd_devlen = 6;
 
-                       DBG_871X( "[%s] Found WFD IE!\n", __FUNCTION__ );
+                       DBG_871X( "[%s] Found WFD IE!\n", __func__ );
                        if ( rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, wfd_devinfo, &wfd_devlen ) )
                        {
                                u16     wfd_devinfo_field = 0;
@@ -5051,7 +5051,7 @@ static int rtw_p2p_set_pc(struct net_device *dev,
        }
        else
        {
-               DBG_871X( "[%s] NOT Found in the Scanning Queue!\n", __FUNCTION__ );
+               DBG_871X( "[%s] NOT Found in the Scanning Queue!\n", __func__ );
        }
 #endif // CONFIG_WFD
 
@@ -5098,11 +5098,11 @@ static int rtw_p2p_set_sa(struct net_device *dev,
        //      0: disable persistent group functionality
        //      1: enable persistent group founctionality
 
-       DBG_871X( "[%s] data = %s\n", __FUNCTION__, extra );
+       DBG_871X( "[%s] data = %s\n", __func__, extra );
 
        if ( 0 )
        {
-               DBG_871X( "[%s] WiFi Direct is disable!\n", __FUNCTION__ );
+               DBG_871X( "[%s] WiFi Direct is disable!\n", __func__ );
                return ret;
        }
        else
@@ -5120,7 +5120,7 @@ static int rtw_p2p_set_sa(struct net_device *dev,
                        pwdinfo->session_available = false;
                }
        }
-       printk( "[%s] session available = %d\n", __FUNCTION__, pwdinfo->session_available );
+       printk( "[%s] session available = %d\n", __func__, pwdinfo->session_available );
 
 exit:
 
@@ -5165,11 +5165,11 @@ static int rtw_p2p_prov_disc(struct net_device *dev,
        //      Format: 00:E0:4C:00:00:05_pbc
        //      Format: 00:E0:4C:00:00:05_label
 
-       DBG_871X( "[%s] data = %s\n", __FUNCTION__, extra );
+       DBG_871X( "[%s] data = %s\n", __func__, extra );
 
        if ( pwdinfo->p2p_state == P2P_STATE_NONE )
        {
-               DBG_871X( "[%s] WiFi Direct is disable!\n", __FUNCTION__ );
+               DBG_871X( "[%s] WiFi Direct is disable!\n", __func__ );
                return ret;
        }
        else
@@ -5206,7 +5206,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev,
        }
        else
        {
-               DBG_871X( "[%s] Unknown WPS config methodn", __FUNCTION__ );
+               DBG_871X( "[%s] Unknown WPS config methodn", __func__ );
                return( ret );
        }
 
@@ -5268,7 +5268,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev,
                        u8      wfd_devinfo[ 6 ] = { 0x00 };
                        uint    wfd_devlen = 6;
 
-                       DBG_871X( "[%s] Found WFD IE!\n", __FUNCTION__ );
+                       DBG_871X( "[%s] Found WFD IE!\n", __func__ );
                        if ( rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, wfd_devinfo, &wfd_devlen ) )
                        {
                                u16     wfd_devinfo_field = 0;
@@ -5290,7 +5290,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev,
 
                if ( false == pwfd_info->peer_session_avail )
                {
-                       DBG_871X( "[%s] WFD Session not avaiable!\n", __FUNCTION__ );
+                       DBG_871X( "[%s] WFD Session not avaiable!\n", __func__ );
                        goto exit;
                }
        }
@@ -5299,7 +5299,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev,
        if ( uintPeerChannel )
        {
 
-               DBG_871X( "[%s] peer channel: %d!\n", __FUNCTION__, uintPeerChannel );
+               DBG_871X( "[%s] peer channel: %d!\n", __func__, uintPeerChannel );
 #ifdef CONFIG_CONCURRENT_MODE
                if ( check_fwstate( pbuddy_mlmepriv, _FW_LINKED ) )
                {
@@ -5357,7 +5357,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev,
        }
        else
        {
-               DBG_871X( "[%s] NOT Found in the Scanning Queue!\n", __FUNCTION__ );
+               DBG_871X( "[%s] NOT Found in the Scanning Queue!\n", __func__ );
        }
 exit:
 
@@ -5379,7 +5379,7 @@ static int rtw_p2p_got_wpsinfo(struct net_device *dev,
        struct wifidirect_info  *pwdinfo = &( padapter->wdinfo );
 
 
-       DBG_871X( "[%s] data = %s\n", __FUNCTION__, extra );
+       DBG_871X( "[%s] data = %s\n", __func__, extra );
        //      Added by Albert 20110328
        //      if the input data is P2P_NO_WPSINFO -> reset the wpsinfo
        //      if the input data is P2P_GOT_WPSINFO_PEER_DISPLAY_PIN -> the utility just input the PIN code got from the peer P2P device.
@@ -5427,7 +5427,7 @@ static int rtw_p2p_set(struct net_device *dev,
        struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
        struct mlme_ext_priv    *pmlmeext = &padapter->mlmeextpriv;
 
-       DBG_871X( "[%s] extra = %s\n", __FUNCTION__, extra );
+       DBG_871X( "[%s] extra = %s\n", __func__, extra );
 
        if ( _rtw_memcmp( extra, "enable=", 7 ) )
        {
@@ -5531,7 +5531,7 @@ static int rtw_p2p_get(struct net_device *dev,
        struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
        struct mlme_ext_priv    *pmlmeext = &padapter->mlmeextpriv;
 
-       DBG_871X( "[%s] extra = %s\n", __FUNCTION__, (char*) wrqu->data.pointer );
+       DBG_871X( "[%s] extra = %s\n", __func__, (char*) wrqu->data.pointer );
 
        if ( _rtw_memcmp( wrqu->data.pointer, "status", 6 ) )
        {
@@ -5603,7 +5603,7 @@ static int rtw_p2p_get2(struct net_device *dev,
        struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
        struct mlme_ext_priv    *pmlmeext = &padapter->mlmeextpriv;
 
-       DBG_871X( "[%s] extra = %s\n", __FUNCTION__, (char*) wrqu->data.pointer );
+       DBG_871X( "[%s] extra = %s\n", __func__, (char*) wrqu->data.pointer );
 
        if ( _rtw_memcmp( extra, "wpsCM=", 6 ) )
        {
@@ -5675,7 +5675,7 @@ static int rtw_rereg_nd_name(struct net_device *dev,
                rereg_priv->old_ifname[IFNAMSIZ-1] = 0;
        }
 
-       //DBG_871X("%s wrqu->data.length:%d\n", __FUNCTION__, wrqu->data.length);
+       //DBG_871X("%s wrqu->data.length:%d\n", __func__, wrqu->data.length);
        if (wrqu->data.length > IFNAMSIZ)
                return -EFAULT;
 
@@ -5687,7 +5687,7 @@ static int rtw_rereg_nd_name(struct net_device *dev,
                return ret;
        }
 
-       DBG_871X("%s new_ifname:%s\n", __FUNCTION__, new_ifname);
+       DBG_871X("%s new_ifname:%s\n", __func__, new_ifname);
        if ( 0 != (ret = rtw_change_ifname(padapter, new_ifname)) ) {
                goto exit;
        }
@@ -5703,7 +5703,7 @@ static int rtw_rereg_nd_name(struct net_device *dev,
 
        if (_rtw_memcmp(new_ifname, "disable%d", 9) == true) {
 
-               DBG_871X("%s disable\n", __FUNCTION__);
+               DBG_871X("%s disable\n", __func__);
                // free network queue for Android's timming issue
                rtw_free_network_queue(padapter, true);
 
@@ -6598,7 +6598,7 @@ static int set_group_key(_adapter *padapter, u8 *key, u8 alg, int keyid)
        struct cmd_priv *pcmdpriv=&(padapter->cmdpriv);
        int res=_SUCCESS;
 
-       DBG_871X("%s\n", __FUNCTION__);
+       DBG_871X("%s\n", __func__);
 
        pcmd = (struct cmd_obj*)rtw_zmalloc(sizeof(struct       cmd_obj));
        if (pcmd==NULL) {
@@ -6688,7 +6688,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param,
        struct security_priv* psecuritypriv=&(padapter->securitypriv);
        struct sta_priv *pstapriv = &padapter->stapriv;
 
-       DBG_871X("%s\n", __FUNCTION__);
+       DBG_871X("%s\n", __func__);
 
        param->u.crypt.err = 0;
        param->u.crypt.alg[IEEE_CRYPT_ALG_NAME_LEN - 1] = '\0';
@@ -6820,7 +6820,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param,
                {
                        if (strcmp(param->u.crypt.alg, "WEP") == 0)
                        {
-                               DBG_871X("%s, set group_key, WEP\n", __FUNCTION__);
+                               DBG_871X("%s, set group_key, WEP\n", __func__);
 
                                memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey,  param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len));
 
@@ -6833,7 +6833,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param,
                        }
                        else if (strcmp(param->u.crypt.alg, "TKIP") == 0)
                        {
-                               DBG_871X("%s, set group_key, TKIP\n", __FUNCTION__);
+                               DBG_871X("%s, set group_key, TKIP\n", __func__);
 
                                psecuritypriv->dot118021XGrpPrivacy = _TKIP_;
 
@@ -6849,7 +6849,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param,
                        }
                        else if (strcmp(param->u.crypt.alg, "CCMP") == 0)
                        {
-                               DBG_871X("%s, set group_key, CCMP\n", __FUNCTION__);
+                               DBG_871X("%s, set group_key, CCMP\n", __func__);
 
                                psecuritypriv->dot118021XGrpPrivacy = _AES_;
 
@@ -6857,7 +6857,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param,
                        }
                        else
                        {
-                               DBG_871X("%s, set group_key, none\n", __FUNCTION__);
+                               DBG_871X("%s, set group_key, none\n", __func__);
 
                                psecuritypriv->dot118021XGrpPrivacy = _NO_PRIVACY_;
                        }
@@ -6893,7 +6893,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param,
 
                                if (strcmp(param->u.crypt.alg, "WEP") == 0)
                                {
-                                       DBG_871X("%s, set pairwise key, WEP\n", __FUNCTION__);
+                                       DBG_871X("%s, set pairwise key, WEP\n", __func__);
 
                                        psta->dot118021XPrivacy = _WEP40_;
                                        if (param->u.crypt.key_len==13)
@@ -6903,7 +6903,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param,
                                }
                                else if (strcmp(param->u.crypt.alg, "TKIP") == 0)
                                {
-                                       DBG_871X("%s, set pairwise key, TKIP\n", __FUNCTION__);
+                                       DBG_871X("%s, set pairwise key, TKIP\n", __func__);
 
                                        psta->dot118021XPrivacy = _TKIP_;
 
@@ -6918,13 +6918,13 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param,
                                else if (strcmp(param->u.crypt.alg, "CCMP") == 0)
                                {
 
-                                       DBG_871X("%s, set pairwise key, CCMP\n", __FUNCTION__);
+                                       DBG_871X("%s, set pairwise key, CCMP\n", __func__);
 
                                        psta->dot118021XPrivacy = _AES_;
                                }
                                else
                                {
-                                       DBG_871X("%s, set pairwise key, none\n", __FUNCTION__);
+                                       DBG_871X("%s, set pairwise key, none\n", __func__);
 
                                        psta->dot118021XPrivacy = _NO_PRIVACY_;
                                }
@@ -7012,7 +7012,7 @@ static int rtw_set_beacon(struct net_device *dev, struct ieee_param *param, int
        unsigned char *pbuf = param->u.bcn_ie.buf;
 
 
-       DBG_871X("%s, len=%d\n", __FUNCTION__, len);
+       DBG_871X("%s, len=%d\n", __func__, len);
 
        if (check_fwstate(pmlmepriv, WIFI_AP_STATE) != true)
                return -EINVAL;
@@ -7042,7 +7042,7 @@ static int rtw_hostapd_sta_flush(struct net_device *dev)
        _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
        //struct sta_priv *pstapriv = &padapter->stapriv;
 
-       DBG_871X("%s\n", __FUNCTION__);
+       DBG_871X("%s\n", __func__);
 
        flush_all_cam_entry(padapter);  //clear CAM
 
@@ -7291,7 +7291,7 @@ static int rtw_set_wps_beacon(struct net_device *dev, struct ieee_param *param,
        struct mlme_ext_info    *pmlmeinfo = &(pmlmeext->mlmext_info);
        int ie_len;
 
-       DBG_871X("%s, len=%d\n", __FUNCTION__, len);
+       DBG_871X("%s, len=%d\n", __func__, len);
 
        if (check_fwstate(pmlmepriv, WIFI_AP_STATE) != true)
                return -EINVAL;
@@ -7310,7 +7310,7 @@ static int rtw_set_wps_beacon(struct net_device *dev, struct ieee_param *param,
                pmlmepriv->wps_beacon_ie = rtw_malloc(ie_len);
                pmlmepriv->wps_beacon_ie_len = ie_len;
                if ( pmlmepriv->wps_beacon_ie == NULL) {
-                       DBG_871X("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__);
+                       DBG_871X("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__);
                        return -EINVAL;
                }
 
@@ -7334,7 +7334,7 @@ static int rtw_set_wps_probe_resp(struct net_device *dev, struct ieee_param *par
        struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
        int ie_len;
 
-       DBG_871X("%s, len=%d\n", __FUNCTION__, len);
+       DBG_871X("%s, len=%d\n", __func__, len);
 
        if (check_fwstate(pmlmepriv, WIFI_AP_STATE) != true)
                return -EINVAL;
@@ -7353,7 +7353,7 @@ static int rtw_set_wps_probe_resp(struct net_device *dev, struct ieee_param *par
                pmlmepriv->wps_probe_resp_ie = rtw_malloc(ie_len);
                pmlmepriv->wps_probe_resp_ie_len = ie_len;
                if ( pmlmepriv->wps_probe_resp_ie == NULL) {
-                       DBG_871X("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__);
+                       DBG_871X("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__);
                        return -EINVAL;
                }
                memcpy(pmlmepriv->wps_probe_resp_ie, param->u.bcn_ie.buf, ie_len);
@@ -7371,7 +7371,7 @@ static int rtw_set_wps_assoc_resp(struct net_device *dev, struct ieee_param *par
        struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
        int ie_len;
 
-       DBG_871X("%s, len=%d\n", __FUNCTION__, len);
+       DBG_871X("%s, len=%d\n", __func__, len);
 
        if (check_fwstate(pmlmepriv, WIFI_AP_STATE) != true)
                return -EINVAL;
@@ -7390,7 +7390,7 @@ static int rtw_set_wps_assoc_resp(struct net_device *dev, struct ieee_param *par
                pmlmepriv->wps_assoc_resp_ie = rtw_malloc(ie_len);
                pmlmepriv->wps_assoc_resp_ie_len = ie_len;
                if ( pmlmepriv->wps_assoc_resp_ie == NULL) {
-                       DBG_871X("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__);
+                       DBG_871X("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__);
                        return -EINVAL;
                }
 
@@ -7417,7 +7417,7 @@ static int rtw_set_hidden_ssid(struct net_device *dev, struct ieee_param *param,
 
        if (param->u.wpa_param.name != 0) //dummy test...
        {
-               DBG_871X("%s name(%u) != 0\n", __FUNCTION__, param->u.wpa_param.name);
+               DBG_871X("%s name(%u) != 0\n", __func__, param->u.wpa_param.name);
        }
 
        value = param->u.wpa_param.value;
@@ -7426,7 +7426,7 @@ static int rtw_set_hidden_ssid(struct net_device *dev, struct ieee_param *param,
        if (value != 1 && value != 2)
                value = 0;
 
-       DBG_871X("%s value(%u)\n", __FUNCTION__, value);
+       DBG_871X("%s value(%u)\n", __func__, value);
        pmlmeinfo->hidden_ssid_mode = value;
 
        return ret;
@@ -7497,7 +7497,7 @@ static int rtw_hostapd_ioctl(struct net_device *dev, struct iw_point *p)
        int ret=0;
        _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
 
-       //DBG_871X("%s\n", __FUNCTION__);
+       //DBG_871X("%s\n", __func__);
 
        /*
        * this function is expect to call in master mode, which allows no power saving
@@ -7530,7 +7530,7 @@ static int rtw_hostapd_ioctl(struct net_device *dev, struct iw_point *p)
                goto out;
        }
 
-       //DBG_871X("%s, cmd=%d\n", __FUNCTION__, param->cmd);
+       //DBG_871X("%s, cmd=%d\n", __func__, param->cmd);
 
        switch (param->cmd)
        {
@@ -7711,7 +7711,7 @@ static int rtw_wx_set_priv(struct net_device *dev,
 
                        pmlmepriv->wps_probe_req_ie = rtw_malloc(cp_sz);
                        if ( pmlmepriv->wps_probe_req_ie == NULL) {
-                               printk("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__);
+                               printk("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__);
                                ret =  -EINVAL;
                                goto FREE_EXT;
 
@@ -7797,12 +7797,12 @@ static int rtw_wx_set_priv(struct net_device *dev,
                                else if (0 == strcmp(country_code, "CN"))
                                        channel_plan = RT_CHANNEL_DOMAIN_CHINA;
                                else
-                                       DBG_871X("%s unknown country_code:%s, set to RT_CHANNEL_DOMAIN_FCC\n", __FUNCTION__, country_code);
+                                       DBG_871X("%s unknown country_code:%s, set to RT_CHANNEL_DOMAIN_FCC\n", __func__, country_code);
 
                                memcpy(&wrqd, &channel_plan, sizeof(int));
 
                                if ( 0!=(ret_inner=rtw_wx_set_channel_plan(dev, info, &wrqd, extra)) ) {
-                                       DBG_871X("%s rtw_wx_set_channel_plan error\n", __FUNCTION__);
+                                       DBG_871X("%s rtw_wx_set_channel_plan error\n", __func__);
                                }
 
                                sprintf(ext, "OK");
@@ -7810,7 +7810,7 @@ static int rtw_wx_set_priv(struct net_device *dev,
                        break;
                default :
                        #ifdef  CONFIG_DEBUG_RTW_WX_SET_PRIV
-                       DBG_871X("%s: %s unknowned req=%s\n", __FUNCTION__,
+                       DBG_871X("%s: %s unknowned req=%s\n", __func__,
                                dev->name, ext_dbg);
                        #endif
 
@@ -7822,7 +7822,7 @@ static int rtw_wx_set_priv(struct net_device *dev,
                ret = -EFAULT;
 
        #ifdef CONFIG_DEBUG_RTW_WX_SET_PRIV
-       DBG_871X("%s: %s req=%s rep=%s dwrq->length=%d, strlen(ext)+1=%d\n", __FUNCTION__,
+       DBG_871X("%s: %s req=%s rep=%s dwrq->length=%d, strlen(ext)+1=%d\n", __func__,
                dev->name, ext_dbg ,ext, dwrq->length, (u16)(strlen(ext)+1));
        #endif
 #endif //end of CONFIG_ANDROID
@@ -7850,7 +7850,7 @@ static int rtw_pm_set(struct net_device *dev,
        unsigned        mode = 0;
        _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
 
-       DBG_871X( "[%s] extra = %s\n", __FUNCTION__, extra );
+       DBG_871X( "[%s] extra = %s\n", __func__, extra );
 
        if ( _rtw_memcmp( extra, "lps=", 4 ) )
        {
@@ -7923,7 +7923,7 @@ static int rtw_mp_efuse_get(struct net_device *dev,
        #endif
 
        pch = extra;
-       DBG_871X("%s: in=%s\n", __FUNCTION__, extra);
+       DBG_871X("%s: in=%s\n", __func__, extra);
 
        i = 0;
        //mac 16 "00e04c871200" rmap,00,2
@@ -7968,7 +7968,7 @@ static int rtw_mp_efuse_get(struct net_device *dev,
                mapLen = EFUSE_MAP_SIZE;
                if (rtw_efuse_map_read(padapter, 0, mapLen, pEfuseHal->fakeEfuseInitMap) == _FAIL)
                {
-                       DBG_871X("%s: read realmap Fail!!\n", __FUNCTION__);
+                       DBG_871X("%s: read realmap Fail!!\n", __func__);
                        err = -EFAULT;
                        goto exit;
                }
@@ -7998,40 +7998,40 @@ static int rtw_mp_efuse_get(struct net_device *dev,
        {
                if ((tmp[1]==NULL) || (tmp[2]==NULL))
                {
-                       DBG_871X("%s: rmap Fail!! Parameters error!\n", __FUNCTION__);
+                       DBG_871X("%s: rmap Fail!! Parameters error!\n", __func__);
                        err = -EINVAL;
                        goto exit;
                }
 
                // rmap addr cnts
                addr = simple_strtoul(tmp[1], &ptmp, 16);
-               DBG_871X("%s: addr=%x\n", __FUNCTION__, addr);
+               DBG_871X("%s: addr=%x\n", __func__, addr);
 
                cnts = simple_strtoul(tmp[2], &ptmp, 10);
                if (cnts == 0)
                {
-                       DBG_871X("%s: rmap Fail!! cnts error!\n", __FUNCTION__);
+                       DBG_871X("%s: rmap Fail!! cnts error!\n", __func__);
                        err = -EINVAL;
                        goto exit;
                }
-               DBG_871X("%s: cnts=%d\n", __FUNCTION__, cnts);
+               DBG_871X("%s: cnts=%d\n", __func__, cnts);
 
                EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false);
                if ((addr + cnts) > max_available_size)
                {
-                       DBG_871X("%s: addr(0x%X)+cnts(%d) parameter error!\n", __FUNCTION__, addr, cnts);
+                       DBG_871X("%s: addr(0x%X)+cnts(%d) parameter error!\n", __func__, addr, cnts);
                        err = -EINVAL;
                        goto exit;
                }
 
                if (rtw_efuse_map_read(padapter, addr, cnts, data) == _FAIL)
                {
-                       DBG_871X("%s: rtw_efuse_map_read error!\n", __FUNCTION__);
+                       DBG_871X("%s: rtw_efuse_map_read error!\n", __func__);
                        err = -EFAULT;
                        goto exit;
                }
 
-//             DBG_871X("%s: data={", __FUNCTION__);
+//             DBG_871X("%s: data={", __func__);
                *extra = 0;
                for (i=0; i<cnts; i++) {
 //                     DBG_871X("0x%02x ", data[i]);
@@ -8045,12 +8045,12 @@ static int rtw_mp_efuse_get(struct net_device *dev,
                mapLen = EFUSE_MAX_SIZE;
                if (rtw_efuse_access(padapter, false, addr, mapLen, rawdata) == _FAIL)
                {
-                       DBG_871X("%s: rtw_efuse_access Fail!!\n", __FUNCTION__);
+                       DBG_871X("%s: rtw_efuse_access Fail!!\n", __func__);
                        err = -EFAULT;
                        goto exit;
                }
 
-//             DBG_871X("%s: realraw={\n", __FUNCTION__);
+//             DBG_871X("%s: realraw={\n", __func__);
                sprintf(extra, "\n");
                for (i=0; i<mapLen; i++)
                {
@@ -8076,19 +8076,19 @@ static int rtw_mp_efuse_get(struct net_device *dev,
 
                EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false);
                if ((addr + cnts) > max_available_size) {
-                       DBG_871X("%s: addr(0x%02x)+cnts(%d) parameter error!\n", __FUNCTION__, addr, cnts);
+                       DBG_871X("%s: addr(0x%02x)+cnts(%d) parameter error!\n", __func__, addr, cnts);
                        err = -EFAULT;
                        goto exit;
                }
 
                if (rtw_efuse_map_read(padapter, addr, cnts, data) == _FAIL)
                {
-                       DBG_871X("%s: rtw_efuse_map_read error!\n", __FUNCTION__);
+                       DBG_871X("%s: rtw_efuse_map_read error!\n", __func__);
                        err = -EFAULT;
                        goto exit;
                }
 
-//             DBG_871X("%s: MAC address={", __FUNCTION__);
+//             DBG_871X("%s: MAC address={", __func__);
                *extra = 0;
                for (i=0; i<cnts; i++)
                {
@@ -8110,18 +8110,18 @@ static int rtw_mp_efuse_get(struct net_device *dev,
                EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false);
                if ((addr + cnts) > max_available_size)
                {
-                       DBG_871X("%s: addr(0x%02x)+cnts(%d) parameter error!\n", __FUNCTION__, addr, cnts);
+                       DBG_871X("%s: addr(0x%02x)+cnts(%d) parameter error!\n", __func__, addr, cnts);
                        err = -EFAULT;
                        goto exit;
                }
                if (rtw_efuse_map_read(padapter, addr, cnts, data) == _FAIL)
                {
-                       DBG_871X("%s: rtw_efuse_access error!!\n", __FUNCTION__);
+                       DBG_871X("%s: rtw_efuse_access error!!\n", __func__);
                        err = -EFAULT;
                        goto exit;
                }
 
-//             DBG_871X("%s: {VID,PID}={", __FUNCTION__);
+//             DBG_871X("%s: {VID,PID}={", __func__);
                *extra = 0;
                for (i=0; i<cnts; i++)
                {
@@ -8146,7 +8146,7 @@ static int rtw_mp_efuse_get(struct net_device *dev,
                mapLen = EFUSE_BT_MAX_MAP_LEN;
                if (rtw_BT_efuse_map_read(padapter, 0, mapLen, pEfuseHal->BTEfuseInitMap) == _FAIL)
                {
-                       DBG_871X("%s: rtw_BT_efuse_map_read Fail!!\n", __FUNCTION__);
+                       DBG_871X("%s: rtw_BT_efuse_map_read Fail!!\n", __func__);
                        err = -EFAULT;
                        goto exit;
                }
@@ -8177,7 +8177,7 @@ static int rtw_mp_efuse_get(struct net_device *dev,
                mapLen = EFUSE_BT_MAX_MAP_LEN;
                if (rtw_BT_efuse_map_read(padapter, 0, mapLen, pEfuseHal->BTEfuseInitMap) == _FAIL)
                {
-                       DBG_871X("%s: rtw_BT_efuse_map_read Fail!!\n", __FUNCTION__);
+                       DBG_871X("%s: rtw_BT_efuse_map_read Fail!!\n", __func__);
                        err = -EFAULT;
                        goto exit;
                }
@@ -8214,34 +8214,34 @@ static int rtw_mp_efuse_get(struct net_device *dev,
 
                // rmap addr cnts
                addr = simple_strtoul(tmp[1], &ptmp, 16);
-               DBG_871X("%s: addr=0x%X\n", __FUNCTION__, addr);
+               DBG_871X("%s: addr=0x%X\n", __func__, addr);
 
                cnts = simple_strtoul(tmp[2], &ptmp, 10);
                if (cnts == 0)
                {
-                       DBG_871X("%s: btrmap Fail!! cnts error!\n", __FUNCTION__);
+                       DBG_871X("%s: btrmap Fail!! cnts error!\n", __func__);
                        err = -EINVAL;
                        goto exit;
                }
-               DBG_871X("%s: cnts=%d\n", __FUNCTION__, cnts);
+               DBG_871X("%s: cnts=%d\n", __func__, cnts);
 
                EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false);
                if ((addr + cnts) > max_available_size)
                {
-                       DBG_871X("%s: addr(0x%X)+cnts(%d) parameter error!\n", __FUNCTION__, addr, cnts);
+                       DBG_871X("%s: addr(0x%X)+cnts(%d) parameter error!\n", __func__, addr, cnts);
                        err = -EFAULT;
                        goto exit;
                }
 
                if (rtw_BT_efuse_map_read(padapter, addr, cnts, data) == _FAIL)
                {
-                       DBG_871X("%s: rtw_BT_efuse_map_read error!!\n", __FUNCTION__);
+                       DBG_871X("%s: rtw_BT_efuse_map_read error!!\n", __func__);
                        err = -EFAULT;
                        goto exit;
                }
 
                *extra = 0;
-//             DBG_871X("%s: bt efuse data={", __FUNCTION__);
+//             DBG_871X("%s: bt efuse data={", __func__);
                for (i=0; i<cnts; i++)
                {
 //                     DBG_871X("0x%02x ", data[i]);
@@ -8404,7 +8404,7 @@ static int rtw_mp_efuse_set(struct net_device *dev,
        #endif
 
        pch = extra;
-       DBG_871X("%s: in=%s\n", __FUNCTION__, extra);
+       DBG_871X("%s: in=%s\n", __func__, extra);
 
        i = 0;
        while ((token = strsep(&pch, ",")) != NULL)
@@ -8440,9 +8440,9 @@ static int rtw_mp_efuse_set(struct net_device *dev,
                        goto exit;
                }
 
-               DBG_871X("%s: addr=0x%X\n", __FUNCTION__, addr);
-               DBG_871X("%s: cnts=%d\n", __FUNCTION__, cnts);
-               DBG_871X("%s: map data=%s\n", __FUNCTION__, tmp[2]);
+               DBG_871X("%s: addr=0x%X\n", __func__, addr);
+               DBG_871X("%s: cnts=%d\n", __func__, cnts);
+               DBG_871X("%s: map data=%s\n", __func__, tmp[2]);
 
                for (jj=0, kk=0; jj<cnts; jj++, kk+=2)
                {
@@ -8451,14 +8451,14 @@ static int rtw_mp_efuse_set(struct net_device *dev,
                EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false);
                if ((addr+cnts) > max_available_size)
                {
-                       DBG_871X("%s: addr(0x%X)+cnts(%d) parameter error!\n", __FUNCTION__, addr, cnts);
+                       DBG_871X("%s: addr(0x%X)+cnts(%d) parameter error!\n", __func__, addr, cnts);
                        err = -EFAULT;
                        goto exit;
                }
 
                if (rtw_efuse_map_write(padapter, addr, cnts, setdata) == _FAIL)
                {
-                       DBG_871X("%s: rtw_efuse_map_write error!!\n", __FUNCTION__);
+                       DBG_871X("%s: rtw_efuse_map_write error!!\n", __func__);
                        err = -EFAULT;
                        goto exit;
                }
@@ -8487,9 +8487,9 @@ static int rtw_mp_efuse_set(struct net_device *dev,
                        goto exit;
                }
 
-               DBG_871X("%s: addr=0x%X\n", __FUNCTION__, addr);
-               DBG_871X("%s: cnts=%d\n", __FUNCTION__, cnts);
-               DBG_871X("%s: raw data=%s\n", __FUNCTION__, tmp[2]);
+               DBG_871X("%s: addr=0x%X\n", __func__, addr);
+               DBG_871X("%s: cnts=%d\n", __func__, cnts);
+               DBG_871X("%s: raw data=%s\n", __func__, tmp[2]);
 
                for (jj=0, kk=0; jj<cnts; jj++, kk+=2)
                {
@@ -8498,7 +8498,7 @@ static int rtw_mp_efuse_set(struct net_device *dev,
 
                if (rtw_efuse_access(padapter, true, addr, cnts, setrawdata) == _FAIL)
                {
-                       DBG_871X("%s: rtw_efuse_access error!!\n", __FUNCTION__);
+                       DBG_871X("%s: rtw_efuse_access error!!\n", __func__);
                        err = -EFAULT;
                        goto exit;
                }
@@ -8524,28 +8524,28 @@ static int rtw_mp_efuse_set(struct net_device *dev,
                        goto exit;
                }
                if (cnts > 6) {
-                       DBG_871X("%s: error data for mac addr=\"%s\"\n", __FUNCTION__, tmp[1]);
+                       DBG_871X("%s: error data for mac addr=\"%s\"\n", __func__, tmp[1]);
                        err = -EFAULT;
                        goto exit;
                }
 
-               DBG_871X("%s: addr=0x%X\n", __FUNCTION__, addr);
-               DBG_871X("%s: cnts=%d\n", __FUNCTION__, cnts);
-               DBG_871X("%s: MAC address=%s\n", __FUNCTION__, tmp[1]);
+               DBG_871X("%s: addr=0x%X\n", __func__, addr);
+               DBG_871X("%s: cnts=%d\n", __func__, cnts);
+               DBG_871X("%s: MAC address=%s\n", __func__, tmp[1]);
 
                for (jj=0, kk=0; jj<cnts; jj++, kk+=2)
                        setdata[jj] = key_2char2num(tmp[1][kk], tmp[1][kk+1]);
                EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&max_available_size, false);
                if ((addr+cnts) > max_available_size)
                {
-                       DBG_871X("%s: addr(0x%X)+cnts(%d) parameter error!\n", __FUNCTION__, addr, cnts);
+                       DBG_871X("%s: addr(0x%X)+cnts(%d) parameter error!\n", __func__, addr, cnts);
                        err = -EFAULT;
                        goto exit;
                }
 
                if (rtw_efuse_map_write(padapter, addr, cnts, setdata) == _FAIL)
                {
-                       DBG_871X("%s: rtw_efuse_map_write error!!\n", __FUNCTION__);
+                       DBG_871X("%s: rtw_efuse_map_write error!!\n", __func__);
                        err = -EFAULT;
                        goto exit;
                }
@@ -8573,9 +8573,9 @@ static int rtw_mp_efuse_set(struct net_device *dev,
                        goto exit;
                }
 
-               DBG_871X("%s: addr=0x%X\n", __FUNCTION__, addr);
-               DBG_871X("%s: cnts=%d\n", __FUNCTION__, cnts);
-               DBG_871X("%s: VID/PID=%s\n", __FUNCTION__, tmp[1]);
+               DBG_871X("%s: addr=0x%X\n", __func__, addr);
+               DBG_871X("%s: cnts=%d\n", __func__, cnts);
+               DBG_871X("%s: VID/PID=%s\n", __func__, tmp[1]);
 
                for (jj=0, kk=0; jj<cnts; jj++, kk+=2)
                {
@@ -8585,14 +8585,14 @@ static int rtw_mp_efuse_set(struct net_device *dev,
                EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false);
                if ((addr+cnts) > max_available_size)
                {
-                       DBG_871X("%s: addr(0x%X)+cnts(%d) parameter error!\n", __FUNCTION__, addr, cnts);
+                       DBG_871X("%s: addr(0x%X)+cnts(%d) parameter error!\n", __func__, addr, cnts);
                        err = -EFAULT;
                        goto exit;
                }
 
                if (rtw_efuse_map_write(padapter, addr, cnts, setdata) == _FAIL)
                {
-                       DBG_871X("%s: rtw_efuse_map_write error!!\n", __FUNCTION__);
+                       DBG_871X("%s: rtw_efuse_map_write error!!\n", __func__);
                        err = -EFAULT;
                        goto exit;
                }
@@ -8621,9 +8621,9 @@ static int rtw_mp_efuse_set(struct net_device *dev,
                        goto exit;
                }
 
-               DBG_871X("%s: addr=0x%X\n", __FUNCTION__, addr);
-               DBG_871X("%s: cnts=%d\n", __FUNCTION__, cnts);
-               DBG_871X("%s: BT data=%s\n", __FUNCTION__, tmp[2]);
+               DBG_871X("%s: addr=0x%X\n", __func__, addr);
+               DBG_871X("%s: cnts=%d\n", __func__, cnts);
+               DBG_871X("%s: BT data=%s\n", __func__, tmp[2]);
 
                for (jj=0, kk=0; jj<cnts; jj++, kk+=2)
                {
@@ -8633,14 +8633,14 @@ static int rtw_mp_efuse_set(struct net_device *dev,
                EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false);
                if ((addr+cnts) > max_available_size)
                {
-                       DBG_871X("%s: addr(0x%X)+cnts(%d) parameter error!\n", __FUNCTION__, addr, cnts);
+                       DBG_871X("%s: addr(0x%X)+cnts(%d) parameter error!\n", __func__, addr, cnts);
                        err = -EFAULT;
                        goto exit;
                }
 
                if (rtw_BT_efuse_map_write(padapter, addr, cnts, setdata) == _FAIL)
                {
-                       DBG_871X("%s: rtw_BT_efuse_map_write error!!\n", __FUNCTION__);
+                       DBG_871X("%s: rtw_BT_efuse_map_write error!!\n", __func__);
                        err = -EFAULT;
                        goto exit;
                }
@@ -8669,9 +8669,9 @@ static int rtw_mp_efuse_set(struct net_device *dev,
                        goto exit;
                }
 
-               DBG_871X("%s: addr=0x%X\n", __FUNCTION__, addr);
-               DBG_871X("%s: cnts=%d\n", __FUNCTION__, cnts);
-               DBG_871X("%s: BT tmp data=%s\n", __FUNCTION__, tmp[2]);
+               DBG_871X("%s: addr=0x%X\n", __func__, addr);
+               DBG_871X("%s: cnts=%d\n", __func__, cnts);
+               DBG_871X("%s: BT tmp data=%s\n", __func__, tmp[2]);
 
                for (jj=0, kk=0; jj<cnts; jj++, kk+=2)
                {
@@ -8681,18 +8681,18 @@ static int rtw_mp_efuse_set(struct net_device *dev,
        else if (strcmp(tmp[0], "btdumpfake") == 0)
        {
                if (rtw_BT_efuse_map_read(padapter, 0, EFUSE_BT_MAX_MAP_LEN, pEfuseHal->fakeBTEfuseModifiedMap) == _SUCCESS) {
-                       DBG_871X("%s: BT read all map success\n", __FUNCTION__);
+                       DBG_871X("%s: BT read all map success\n", __func__);
                } else {
-                       DBG_871X("%s: BT read all map Fail!\n", __FUNCTION__);
+                       DBG_871X("%s: BT read all map Fail!\n", __func__);
                        err = -EFAULT;
                }
        }
        else if (strcmp(tmp[0], "wldumpfake") == 0)
        {
                if (rtw_efuse_map_read(padapter, 0, EFUSE_BT_MAX_MAP_LEN,  pEfuseHal->fakeEfuseModifiedMap) == _SUCCESS) {
-                       DBG_871X("%s: BT read all map success\n", __FUNCTION__);
+                       DBG_871X("%s: BT read all map success\n", __func__);
                } else {
-                       DBG_871X("%s: BT read all map  Fail\n", __FUNCTION__);
+                       DBG_871X("%s: BT read all map  Fail\n", __func__);
                        err = -EFAULT;
                }
        }
@@ -8709,7 +8709,7 @@ static int rtw_mp_efuse_set(struct net_device *dev,
 
                if (rtw_BT_efuse_map_write(padapter, 0x00, EFUSE_BT_MAX_MAP_LEN, pEfuseHal->fakeBTEfuseModifiedMap) == _FAIL)
                {
-                       DBG_871X("%s: rtw_BT_efuse_map_write error!\n", __FUNCTION__);
+                       DBG_871X("%s: rtw_BT_efuse_map_write error!\n", __func__);
                        err = -EFAULT;
                        goto exit;
                }
@@ -8725,7 +8725,7 @@ static int rtw_mp_efuse_set(struct net_device *dev,
 
                if (rtw_efuse_map_write(padapter, 0x00, EFUSE_MAX_MAP_LEN, pEfuseHal->fakeEfuseModifiedMap) == _FAIL)
                {
-                       DBG_871X("%s: rtw_efuse_map_write error!\n", __FUNCTION__);
+                       DBG_871X("%s: rtw_efuse_map_write error!\n", __func__);
                        err = -EFAULT;
                        goto exit;
                }
@@ -8754,9 +8754,9 @@ static int rtw_mp_efuse_set(struct net_device *dev,
                        goto exit;
                }
 
-               DBG_871X("%s: addr=0x%X\n", __FUNCTION__, addr);
-               DBG_871X("%s: cnts=%d\n", __FUNCTION__, cnts);
-               DBG_871X("%s: map tmp data=%s\n", __FUNCTION__, tmp[2]);
+               DBG_871X("%s: addr=0x%X\n", __func__, addr);
+               DBG_871X("%s: cnts=%d\n", __func__, cnts);
+               DBG_871X("%s: map tmp data=%s\n", __func__, tmp[2]);
 
                for (jj=0, kk=0; jj<cnts; jj++, kk+=2)
                {
@@ -9930,8 +9930,8 @@ static int rtw_mp_SetBT(struct net_device *dev,
                cnts = strlen(tmp[1]);
                if (cnts<1) return -EFAULT;
 
-               DBG_871X("%s: cnts=%d\n", __FUNCTION__, cnts);
-               DBG_871X("%s: data=%s\n", __FUNCTION__, tmp[1]);
+               DBG_871X("%s: cnts=%d\n", __func__, cnts);
+               DBG_871X("%s: data=%s\n", __func__, tmp[1]);
 
                for (jj=0, kk=0; jj<cnts; jj++, kk+=2)
                {
@@ -9975,7 +9975,7 @@ static int rtw_mp_SetBT(struct net_device *dev,
        }
 
 
-       DBG_871X("%s: BtReq.paraLength =%d\n", __FUNCTION__, BtReq.paraLength);
+       DBG_871X("%s: BtReq.paraLength =%d\n", __func__, BtReq.paraLength);
 
        DBG_871X("opCodeVer=%d,OpCode=%d\n",BtReq.opCodeVer,BtReq.OpCode);
 
@@ -10202,7 +10202,7 @@ static int rtw_wfd_tdls_enable(struct net_device *dev,
 
        _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
 
-       printk( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length -1  );
+       printk( "[%s] %s %d\n", __func__, extra, wrqu->data.length -1  );
 
        if ( extra[ 0 ] == '0' )
        {
@@ -10230,7 +10230,7 @@ static int rtw_tdls_weaksec(struct net_device *dev,
        u8 i, j;
        _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
 
-       DBG_871X( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length -1  );
+       DBG_871X( "[%s] %s %d\n", __func__, extra, wrqu->data.length -1  );
 
        if ( extra[ 0 ] == '0' )
        {
@@ -10264,7 +10264,7 @@ static int rtw_tdls_enable(struct net_device *dev,
        u8 tdls_sta[NUM_STA][ETH_ALEN];
        u8 empty_hwaddr[ETH_ALEN] = { 0x00 };
 
-       printk( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length -1  );
+       printk( "[%s] %s %d\n", __func__, extra, wrqu->data.length -1  );
 
        memset(tdls_sta, 0x00, sizeof(tdls_sta));
 
@@ -10331,7 +10331,7 @@ static int rtw_tdls_setup(struct net_device *dev,
        struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
 #endif // CONFIG_WFD
 
-       printk( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length -1  );
+       printk( "[%s] %s %d\n", __func__, extra, wrqu->data.length -1  );
 
        for ( i=0, j=0 ; i < ETH_ALEN; i++, j+=3 ) {
                mac_addr[i]=key_2char2num(*(extra+j), *(extra+j+1));
@@ -10344,7 +10344,7 @@ static int rtw_tdls_setup(struct net_device *dev,
                if ( 0 == pwdinfo->wfd_tdls_weaksec )
                {
                        //      Can't send the tdls setup request out!!
-                       DBG_871X( "[%s] Current link is not AES, SKIP sending the tdls setup request!!\n", __FUNCTION__ );
+                       DBG_871X( "[%s] Current link is not AES, SKIP sending the tdls setup request!!\n", __func__ );
                }
                else
                {
@@ -10374,7 +10374,7 @@ static int rtw_tdls_teardown(struct net_device *dev,
        struct sta_info *ptdls_sta = NULL;
        u8 mac_addr[ETH_ALEN];
 
-       DBG_871X( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length -1  );
+       DBG_871X( "[%s] %s %d\n", __func__, extra, wrqu->data.length -1  );
 
        for ( i=0, j=0 ; i < ETH_ALEN; i++, j+=3 ) {
                mac_addr[i]=key_2char2num(*(extra+j), *(extra+j+1));
@@ -10405,7 +10405,7 @@ static int rtw_tdls_discovery(struct net_device *dev,
        struct mlme_ext_priv    *pmlmeext = &(padapter->mlmeextpriv);
        struct mlme_ext_info    *pmlmeinfo = &(pmlmeext->mlmext_info);
 
-       DBG_871X( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length -1  );
+       DBG_871X( "[%s] %s %d\n", __func__, extra, wrqu->data.length -1  );
 
        issue_tdls_dis_req(padapter, NULL);
 
@@ -10427,7 +10427,7 @@ static int rtw_tdls_ch_switch (struct net_device *dev,
        u8 i, j, mac_addr[ETH_ALEN];
        struct sta_info *ptdls_sta = NULL;
 
-       DBG_8192C( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length -1  );
+       DBG_8192C( "[%s] %s %d\n", __func__, extra, wrqu->data.length -1  );
 
        for ( i=0, j=0 ; i < ETH_ALEN; i++, j+=3 ) {
                mac_addr[i]=key_2char2num(*(extra+j), *(extra+j+1));
@@ -10459,7 +10459,7 @@ static int rtw_tdls_pson(struct net_device *dev,
        u8 i, j, mac_addr[ETH_ALEN];
        struct sta_info *ptdls_sta = NULL;
 
-       DBG_871X( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length -1  );
+       DBG_871X( "[%s] %s %d\n", __func__, extra, wrqu->data.length -1  );
 
        for ( i=0, j=0 ; i < ETH_ALEN; i++, j+=3 ) {
                mac_addr[i]=key_2char2num(*(extra+j), *(extra+j+1));
@@ -10488,7 +10488,7 @@ static int rtw_tdls_psoff(struct net_device *dev,
        u8 i, j, mac_addr[ETH_ALEN];
        struct sta_info *ptdls_sta = NULL;
 
-       DBG_8192C( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length -1  );
+       DBG_8192C( "[%s] %s %d\n", __func__, extra, wrqu->data.length -1  );
 
        for ( i=0, j=0 ; i < ETH_ALEN; i++, j+=3 ) {
                mac_addr[i]=key_2char2num(*(extra+j), *(extra+j+1));
@@ -10517,7 +10517,7 @@ static int rtw_tdls_setip(struct net_device *dev,
        struct wifi_display_info *pwfd_info = ptdlsinfo->wfd_info;
        u8 i=0, j=0, k=0, tag=0, ip[3] = { 0xff }, *ptr = extra;
 
-       printk( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length - 1  );
+       printk( "[%s] %s %d\n", __func__, extra, wrqu->data.length - 1  );
 
 
        while ( i < 4 )
@@ -10540,7 +10540,7 @@ static int rtw_tdls_setip(struct net_device *dev,
                i++;
        }
 
-       printk( "[%s] Set IP = %u.%u.%u.%u\n", __FUNCTION__,
+       printk( "[%s] Set IP = %u.%u.%u.%u\n", __func__,
                ptdlsinfo->wfd_info->ip_address[0], ptdlsinfo->wfd_info->ip_address[1],
                ptdlsinfo->wfd_info->ip_address[2], ptdlsinfo->wfd_info->ip_address[3]
        );
@@ -10564,14 +10564,14 @@ static int rtw_tdls_getip(struct net_device *dev,
        struct tdls_info *ptdlsinfo = &padapter->tdlsinfo;
        struct wifi_display_info *pwfd_info = ptdlsinfo->wfd_info;
 
-       printk( "[%s]\n", __FUNCTION__);
+       printk( "[%s]\n", __func__);
 
        sprintf( extra, "\n\n%u.%u.%u.%u\n",
                pwfd_info->peer_ip_address[0], pwfd_info->peer_ip_address[1],
                pwfd_info->peer_ip_address[2], pwfd_info->peer_ip_address[3]
                );
 
-       printk( "[%s] IP=%u.%u.%u.%u\n", __FUNCTION__,
+       printk( "[%s] IP=%u.%u.%u.%u\n", __func__,
                pwfd_info->peer_ip_address[0], pwfd_info->peer_ip_address[1],
                pwfd_info->peer_ip_address[2], pwfd_info->peer_ip_address[3]
                );
@@ -10598,10 +10598,10 @@ static int rtw_tdls_getport(struct net_device *dev,
        struct tdls_info *ptdlsinfo = &padapter->tdlsinfo;
        struct wifi_display_info *pwfd_info = ptdlsinfo->wfd_info;
 
-       printk( "[%s]\n", __FUNCTION__);
+       printk( "[%s]\n", __func__);
 
        sprintf( extra, "\n\n%d\n", pwfd_info->peer_rtsp_ctrlport );
-       printk( "[%s] remote port = %d\n", __FUNCTION__, pwfd_info->peer_rtsp_ctrlport );
+       printk( "[%s] remote port = %d\n", __func__, pwfd_info->peer_rtsp_ctrlport );
 
        wrqu->data.length = strlen( extra );
 
@@ -10627,7 +10627,7 @@ static int rtw_tdls_dis_result(struct net_device *dev,
        struct tdls_info *ptdlsinfo = &padapter->tdlsinfo;
        struct wifi_display_info *pwfd_info = ptdlsinfo->wfd_info;
 
-       printk( "[%s]\n", __FUNCTION__);
+       printk( "[%s]\n", __func__);
 
        if (ptdlsinfo->dev_discovered == 1 )
        {
@@ -10659,7 +10659,7 @@ static int rtw_wfd_tdls_status(struct net_device *dev,
        struct tdls_info *ptdlsinfo = &padapter->tdlsinfo;
        struct wifi_display_info *pwfd_info = ptdlsinfo->wfd_info;
 
-       printk( "[%s]\n", __FUNCTION__);
+       printk( "[%s]\n", __func__);
 
        if (ptdlsinfo->setup_state == TDLS_LINKED_STATE )
        {
@@ -10691,7 +10691,7 @@ static int rtw_tdls_ch_switch_off(struct net_device *dev,
        u8 i, j, mac_addr[ETH_ALEN];
        struct sta_info *ptdls_sta = NULL;
 
-       DBG_871X( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length -1  );
+       DBG_871X( "[%s] %s %d\n", __func__, extra, wrqu->data.length -1  );
 
        for ( i=0, j=0 ; i < ETH_ALEN; i++, j+=3 ) {
                mac_addr[i]=key_2char2num(*(extra+j), *(extra+j+1));
@@ -10722,7 +10722,7 @@ static int rtw_tdls(struct net_device *dev,
 #ifdef CONFIG_TDLS
        _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
 
-       DBG_871X( "[%s] extra = %s\n", __FUNCTION__, extra );
+       DBG_871X( "[%s] extra = %s\n", __func__, extra );
        //      WFD Sigma will use the tdls enable command to let the driver know we want to test the tdls now!
        if ( _rtw_memcmp( extra, "wfdenable=", 10 ) )
        {
@@ -10810,7 +10810,7 @@ static int rtw_tdls_get(struct net_device *dev,
 
 #ifdef CONFIG_WFD
 
-       DBG_871X( "[%s] extra = %s\n", __FUNCTION__, (char*) wrqu->data.pointer );
+       DBG_871X( "[%s] extra = %s\n", __func__, (char*) wrqu->data.pointer );
 
        if ( _rtw_memcmp( wrqu->data.pointer, "ip", 2 ) )
        {
@@ -10868,7 +10868,7 @@ static int rtw_widi_set_probe_request(struct net_device *dev,
                intel_widi_wk_cmd(padapter, INTEL_WIDI_ISSUE_PROB_WK, pbuf);
        }
 #else
-       DBG_871X( "[%s] len = %d\n", __FUNCTION__,wrqu->data.length);
+       DBG_871X( "[%s] len = %d\n", __func__,wrqu->data.length);
 
        issue_probereq_widi(padapter, wrqu->data.pointer);
 #endif
index ad83f23..9ccb01a 100755 (executable)
@@ -348,7 +348,7 @@ static int mgnt_xmit_entry(struct sk_buff *skb, struct net_device *pnetdev)
        struct hostapd_priv *phostapdpriv = rtw_netdev_priv(pnetdev);
        _adapter *padapter = (_adapter *)phostapdpriv->padapter;
 
-       //DBG_871X("%s\n", __FUNCTION__);
+       //DBG_871X("%s\n", __func__);
 
        return rtw_hal_hostap_mgnt_xmit_entry(padapter, skb);
 }
@@ -378,7 +378,7 @@ static int mgnt_netdev_close(struct net_device *pnetdev)
 {
        struct hostapd_priv *phostapdpriv = rtw_netdev_priv(pnetdev);
 
-       DBG_871X("%s\n", __FUNCTION__);
+       DBG_871X("%s\n", __func__);
 
        usb_kill_anchored_urbs(&phostapdpriv->anchored);
 
index d90f511..5550e07 100644 (file)
@@ -1906,7 +1906,7 @@ void netdev_br_init(struct net_device *netdev)
                                memcpy(adapter->br_mac, br_netdev->dev_addr, ETH_ALEN);
                                dev_put(br_netdev);
                        } else
-                               printk("%s()-%d: dev_get_by_name(%s) failed!", __FUNCTION__, __LINE__, CONFIG_BR_EXT_BRNAME);
+                               printk("%s()-%d: dev_get_by_name(%s) failed!", __func__, __LINE__, CONFIG_BR_EXT_BRNAME);
                }
 
                adapter->ethBrExtInfo.addPPPoETag = 1;
@@ -2055,7 +2055,7 @@ int  ips_netdrv_open(_adapter *padapter)
 {
        int status = _SUCCESS;
        padapter->net_closed = false;
-       DBG_871X("===> %s.........\n",__FUNCTION__);
+       DBG_871X("===> %s.........\n",__func__);
 
 
        padapter->bDriverStopped = false;
@@ -2123,7 +2123,7 @@ void rtw_ips_dev_unload(_adapter *padapter)
 {
        struct net_device *pnetdev= (struct net_device*)padapter->pnetdev;
        struct xmit_priv        *pxmitpriv = &(padapter->xmitpriv);
-       DBG_871X("====> %s...\n",__FUNCTION__);
+       DBG_871X("====> %s...\n",__func__);
 
        rtw_hal_set_hwreg(padapter, HW_VAR_FIFO_CLEARN_UP, 0);
 
index f10a9e2..b5853f9 100755 (executable)
@@ -118,7 +118,7 @@ void* rtw_malloc2d(int h, int w, int size)
        void **a = (void **) rtw_zmalloc( h*sizeof(void *) + h*w*size );
        if (a == NULL)
        {
-               DBG_871X("%s: alloc memory fail!\n", __FUNCTION__);
+               DBG_871X("%s: alloc memory fail!\n", __func__);
                return NULL;
        }
 
@@ -323,14 +323,14 @@ void rtw_usleep_os(int us)
 #ifdef DBG_DELAY_OS
 void _rtw_mdelay_os(int ms, const char *func, const int line)
 {
-       DBG_871X("%s:%d %s(%d)\n", func, line, __FUNCTION__, ms);
+       DBG_871X("%s:%d %s(%d)\n", func, line, __func__, ms);
 
        mdelay((unsigned long)ms);
 }
 
 void _rtw_udelay_os(int us, const char *func, const int line)
 {
-       DBG_871X("%s:%d %s(%d)\n", func, line, __FUNCTION__, us);
+       DBG_871X("%s:%d %s(%d)\n", func, line, __func__, us);
 
       udelay((unsigned long)us);
 }
@@ -387,7 +387,7 @@ inline void rtw_lock_suspend()
        #endif
 
        #if  defined(CONFIG_WAKELOCK) || defined(CONFIG_ANDROID_POWER)
-       //DBG_871X("####%s: suspend_lock_count:%d####\n", __FUNCTION__, rtw_suspend_lock.stat.count);
+       //DBG_871X("####%s: suspend_lock_count:%d####\n", __func__, rtw_suspend_lock.stat.count);
        #endif
 }
 
@@ -400,7 +400,7 @@ inline void rtw_unlock_suspend()
        #endif
 
        #if  defined(CONFIG_WAKELOCK) || defined(CONFIG_ANDROID_POWER)
-       //DBG_871X("####%s: suspend_lock_count:%d####\n", __FUNCTION__, rtw_suspend_lock.stat.count);
+       //DBG_871X("####%s: suspend_lock_count:%d####\n", __func__, rtw_suspend_lock.stat.count);
        #endif
 }
 
@@ -583,20 +583,20 @@ static int retriveFromFile(char *path, u8* buf, u32 sz)
 
        if (path && buf) {
                if ( 0 == (ret=openFile(&fp,path, O_RDONLY, 0)) ) {
-                       DBG_871X("%s openFile path:%s fp=%p\n",__FUNCTION__, path ,fp);
+                       DBG_871X("%s openFile path:%s fp=%p\n",__func__, path ,fp);
 
                        oldfs = get_fs(); set_fs(get_ds());
                        ret=readFile(fp, buf, sz);
                        set_fs(oldfs);
                        closeFile(fp);
 
-                       DBG_871X("%s readFile, ret:%d\n",__FUNCTION__, ret);
+                       DBG_871X("%s readFile, ret:%d\n",__func__, ret);
 
                } else {
-                       DBG_871X("%s openFile path:%s Fail, ret:%d\n",__FUNCTION__, path, ret);
+                       DBG_871X("%s openFile path:%s Fail, ret:%d\n",__func__, path, ret);
                }
        } else {
-               DBG_871X("%s NULL pointer\n",__FUNCTION__);
+               DBG_871X("%s NULL pointer\n",__func__);
                ret =  -EINVAL;
        }
        return ret;
@@ -617,20 +617,20 @@ static int storeToFile(char *path, u8* buf, u32 sz)
 
        if (path && buf) {
                if ( 0 == (ret=openFile(&fp, path, O_CREAT|O_WRONLY, 0666)) ) {
-                       DBG_871X("%s openFile path:%s fp=%p\n",__FUNCTION__, path ,fp);
+                       DBG_871X("%s openFile path:%s fp=%p\n",__func__, path ,fp);
 
                        oldfs = get_fs(); set_fs(get_ds());
                        ret=writeFile(fp, buf, sz);
                        set_fs(oldfs);
                        closeFile(fp);
 
-                       DBG_871X("%s writeFile, ret:%d\n",__FUNCTION__, ret);
+                       DBG_871X("%s writeFile, ret:%d\n",__func__, ret);
 
                } else {
-                       DBG_871X("%s openFile path:%s Fail, ret:%d\n",__FUNCTION__, path, ret);
+                       DBG_871X("%s openFile path:%s Fail, ret:%d\n",__func__, path, ret);
                }
        } else {
-               DBG_871X("%s NULL pointer\n",__FUNCTION__);
+               DBG_871X("%s NULL pointer\n",__func__);
                ret =  -EINVAL;
        }
        return ret;
index 04c1642..abe7a25 100644 (file)
@@ -228,7 +228,7 @@ _func_enter_;
 #ifdef CONFIG_WAPI_SUPPORT
        if (rtw_wapi_check_for_drop(padapter,precv_frame))
        {
-               WAPI_TRACE(WAPI_ERR, "%s(): Rx Reorder Drop case!!\n", __FUNCTION__);
+               WAPI_TRACE(WAPI_ERR, "%s(): Rx Reorder Drop case!!\n", __func__);
                goto _recv_indicatepkt_drop;
        }
 #endif
index be014ba..373bdfd 100644 (file)
@@ -147,10 +147,10 @@ static int wl_android_set_pno_setup(struct net_device *dev, char *command, int t
                };
 #endif /* PNO_SET_DEBUG */
 
-       DHD_INFO(("%s: command=%s, len=%d\n", __FUNCTION__, command, total_len));
+       DHD_INFO(("%s: command=%s, len=%d\n", __func__, command, total_len));
 
        if (total_len < (strlen(CMD_PNOSETUP_SET) + sizeof(cmd_tlv_t))) {
-               DBG_871X("%s argument=%d less min size\n", __FUNCTION__, total_len);
+               DBG_871X("%s argument=%d less min size\n", __func__, total_len);
                goto exit_proc;
        }
 
@@ -182,35 +182,35 @@ static int wl_android_set_pno_setup(struct net_device *dev, char *command, int t
                } else {
                        if ((str_ptr[0] != PNO_TLV_TYPE_TIME) || (tlv_size_left <= 1)) {
                                DBG_871X("%s scan duration corrupted field size %d\n",
-                                       __FUNCTION__, tlv_size_left);
+                                       __func__, tlv_size_left);
                                goto exit_proc;
                        }
                        str_ptr++;
                        pno_time = simple_strtoul(str_ptr, &str_ptr, 16);
-                       DHD_INFO(("%s: pno_time=%d\n", __FUNCTION__, pno_time));
+                       DHD_INFO(("%s: pno_time=%d\n", __func__, pno_time));
 
                        if (str_ptr[0] != 0) {
                                if ((str_ptr[0] != PNO_TLV_FREQ_REPEAT)) {
                                        DBG_871X("%s pno repeat : corrupted field\n",
-                                               __FUNCTION__);
+                                               __func__);
                                        goto exit_proc;
                                }
                                str_ptr++;
                                pno_repeat = simple_strtoul(str_ptr, &str_ptr, 16);
-                               DHD_INFO(("%s :got pno_repeat=%d\n", __FUNCTION__, pno_repeat));
+                               DHD_INFO(("%s :got pno_repeat=%d\n", __func__, pno_repeat));
                                if (str_ptr[0] != PNO_TLV_FREQ_EXPO_MAX) {
                                        DBG_871X("%s FREQ_EXPO_MAX corrupted field size\n",
-                                               __FUNCTION__);
+                                               __func__);
                                        goto exit_proc;
                                }
                                str_ptr++;
                                pno_freq_expo_max = simple_strtoul(str_ptr, &str_ptr, 16);
                                DHD_INFO(("%s: pno_freq_expo_max=%d\n",
-                                       __FUNCTION__, pno_freq_expo_max));
+                                       __func__, pno_freq_expo_max));
                        }
                }
        } else {
-               DBG_871X("%s get wrong TLV command\n", __FUNCTION__);
+               DBG_871X("%s get wrong TLV command\n", __func__);
                goto exit_proc;
        }
 
@@ -341,13 +341,13 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
        command = kmalloc(priv_cmd.total_len, GFP_KERNEL);
        if (!command)
        {
-               DBG_871X("%s: failed to allocate memory\n", __FUNCTION__);
+               DBG_871X("%s: failed to allocate memory\n", __func__);
                ret = -ENOMEM;
                goto exit;
        }
 
        if (!access_ok(VERIFY_READ, priv_cmd.buf, priv_cmd.total_len)) {
-               DBG_871X("%s: failed to access memory\n", __FUNCTION__);
+               DBG_871X("%s: failed to access memory\n", __func__);
                ret = -EFAULT;
                goto exit;
         }
@@ -357,7 +357,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
        }
 
        DBG_871X("%s: Android private cmd \"%s\" on %s\n"
-               , __FUNCTION__, command, ifr->ifr_name);
+               , __func__, command, ifr->ifr_name);
 
        cmd_num = rtw_android_cmdstr_to_num(command);
 
@@ -371,7 +371,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
 
        if (!g_wifi_on) {
                DBG_871X("%s: Ignore private cmd \"%s\" - iface %s is down\n"
-                       ,__FUNCTION__, command, ifr->ifr_name);
+                       ,__func__, command, ifr->ifr_name);
                ret = 0;
                goto exit;
        }
@@ -536,14 +536,14 @@ response:
                if ((bytes_written == 0) && (priv_cmd.total_len > 0))
                        command[0] = '\0';
                if (bytes_written >= priv_cmd.total_len) {
-                       DBG_871X("%s: bytes_written = %d\n", __FUNCTION__, bytes_written);
+                       DBG_871X("%s: bytes_written = %d\n", __func__, bytes_written);
                        bytes_written = priv_cmd.total_len;
                } else {
                        bytes_written++;
                }
                priv_cmd.used_len = bytes_written;
                if (copy_to_user((void *)priv_cmd.buf, command, bytes_written)) {
-                       DBG_871X("%s: failed to copy data to user buffer\n", __FUNCTION__);
+                       DBG_871X("%s: failed to copy data to user buffer\n", __func__);
                        ret = -EFAULT;
                }
        }
@@ -581,7 +581,7 @@ int rtw_android_wifictrl_func_add(void)
 
        ret = wifi_add_dev();
        if (ret) {
-               DBG_871X("%s: platform_driver_register failed\n", __FUNCTION__);
+               DBG_871X("%s: platform_driver_register failed\n", __func__);
                return ret;
        }
        g_wifidev_registered = 1;
@@ -589,7 +589,7 @@ int rtw_android_wifictrl_func_add(void)
        /* Waiting callback after platform_driver_register is done or exit with error */
        if (down_timeout(&wifi_control_sem,  msecs_to_jiffies(1000)) != 0) {
                ret = -EINVAL;
-               DBG_871X("%s: platform_driver_register timeout\n", __FUNCTION__);
+               DBG_871X("%s: platform_driver_register timeout\n", __func__);
        }
 
        return ret;
@@ -636,7 +636,7 @@ int wifi_get_irq_number(unsigned long *irq_flags_ptr)
 
 int wifi_set_power(int on, unsigned long msec)
 {
-       DBG_871X("%s = %d\n", __FUNCTION__, on);
+       DBG_871X("%s = %d\n", __func__, on);
        if (wifi_control_data && wifi_control_data->set_power) {
                wifi_control_data->set_power(on);
        }
@@ -648,7 +648,7 @@ int wifi_set_power(int on, unsigned long msec)
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35))
 int wifi_get_mac_addr(unsigned char *buf)
 {
-       DBG_871X("%s\n", __FUNCTION__);
+       DBG_871X("%s\n", __func__);
        if (!buf)
                return -EINVAL;
        if (wifi_control_data && wifi_control_data->get_mac_addr) {
@@ -661,7 +661,7 @@ int wifi_get_mac_addr(unsigned char *buf)
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)) || defined(COMPAT_KERNEL_RELEASE)
 void *wifi_get_country_code(char *ccode)
 {
-       DBG_871X("%s\n", __FUNCTION__);
+       DBG_871X("%s\n", __func__);
        if (!ccode)
                return NULL;
        if (wifi_control_data && wifi_control_data->get_country_code) {
@@ -673,7 +673,7 @@ void *wifi_get_country_code(char *ccode)
 
 static int wifi_set_carddetect(int on)
 {
-       DBG_871X("%s = %d\n", __FUNCTION__, on);
+       DBG_871X("%s = %d\n", __func__, on);
        if (wifi_control_data && wifi_control_data->set_carddetect) {
                wifi_control_data->set_carddetect(on);
        }
@@ -685,7 +685,7 @@ static int wifi_probe(struct platform_device *pdev)
        struct wifi_platform_data *wifi_ctrl =
                (struct wifi_platform_data *)(pdev->dev.platform_data);
 
-       DBG_871X("## %s\n", __FUNCTION__);
+       DBG_871X("## %s\n", __func__);
        wifi_irqres = platform_get_resource_byname(pdev, IORESOURCE_IRQ, "bcmdhd_wlan_irq");
        if (wifi_irqres == NULL)
                wifi_irqres = platform_get_resource_byname(pdev,
@@ -704,7 +704,7 @@ static int wifi_remove(struct platform_device *pdev)
        struct wifi_platform_data *wifi_ctrl =
                (struct wifi_platform_data *)(pdev->dev.platform_data);
 
-       DBG_871X("## %s\n", __FUNCTION__);
+       DBG_871X("## %s\n", __func__);
        wifi_control_data = wifi_ctrl;
 
        wifi_set_power(0, 0);   /* Power Off */
@@ -716,7 +716,7 @@ static int wifi_remove(struct platform_device *pdev)
 
 static int wifi_suspend(struct platform_device *pdev, pm_message_t state)
 {
-       DBG_871X("##> %s\n", __FUNCTION__);
+       DBG_871X("##> %s\n", __func__);
 #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 39)) && defined(OOB_INTR_ONLY)
        bcmsdh_oob_intr_set(0);
 #endif
@@ -725,7 +725,7 @@ static int wifi_suspend(struct platform_device *pdev, pm_message_t state)
 
 static int wifi_resume(struct platform_device *pdev)
 {
-       DBG_871X("##> %s\n", __FUNCTION__);
+       DBG_871X("##> %s\n", __func__);
 #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 39)) && defined(OOB_INTR_ONLY)
        if (dhd_os_check_if_up(bcmsdh_get_drvdata()))
                bcmsdh_oob_intr_set(1);
index a392938..6091e1b 100644 (file)
@@ -560,7 +560,7 @@ static void rtw_dev_unload(_adapter *padapter)
                        //DBG_871X("r871x_dev_unload()->rtl871x_hal_deinit()\n");
 #ifdef CONFIG_WOWLAN
                        if ((padapter->pwrctrlpriv.bSupportRemoteWakeup==true)&&(padapter->pwrctrlpriv.wowlan_mode==true)) {
-                               DBG_871X("%s bSupportWakeOnWlan==true  do not run rtw_hal_deinit()\n",__FUNCTION__);
+                               DBG_871X("%s bSupportWakeOnWlan==true  do not run rtw_hal_deinit()\n",__func__);
                        }
                        else
 #endif //CONFIG_WOWLAN
@@ -689,7 +689,7 @@ int rtw_hw_suspend(_adapter *padapter )
        return 0;
 
 error_exit:
-       DBG_871X("%s, failed\n",__FUNCTION__);
+       DBG_871X("%s, failed\n",__func__);
        return (-1);
 
 }
@@ -740,7 +740,7 @@ int rtw_hw_resume(_adapter *padapter)
 
        return 0;
 error_exit:
-       DBG_871X("%s, Open net dev failed\n",__FUNCTION__);
+       DBG_871X("%s, Open net dev failed\n",__func__);
        return (-1);
 }
 #endif
@@ -762,7 +762,7 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
 
        _func_enter_;
 
-       DBG_871X("==> %s (%s:%d)\n",__FUNCTION__, current->comm, current->pid);
+       DBG_871X("==> %s (%s:%d)\n",__func__, current->comm, current->pid);
 
 #ifdef CONFIG_WOWLAN
        if (check_fwstate(pmlmepriv, _FW_LINKED))
@@ -824,8 +824,8 @@ 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_871X("%s:%d assoc_ssid:%s\n", __FUNCTION__, __LINE__, pmlmepriv->assoc_ssid.Ssid);
-               DBG_871X("%s:%d %s(" MAC_FMT "), length:%d assoc_ssid.length:%d\n",__FUNCTION__, __LINE__,
+               //DBG_871X("%s:%d assoc_ssid:%s\n", __func__, __LINE__, pmlmepriv->assoc_ssid.Ssid);
+               DBG_871X("%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,
@@ -858,7 +858,7 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
                rtw_indicate_disconnect(padapter);
 
 exit:
-       DBG_871X("<===  %s return %d.............. in %dms\n", __FUNCTION__
+       DBG_871X("<===  %s return %d.............. in %dms\n", __func__
                , ret, rtw_get_passing_time_ms(start_time));
 
        _func_exit_;
@@ -910,7 +910,7 @@ int rtw_resume_process(_adapter *padapter)
 #endif //#ifdef CONFIG_BT_COEXIST
        _func_enter_;
 
-       DBG_871X("==> %s (%s:%d)\n",__FUNCTION__, current->comm, current->pid);
+       DBG_871X("==> %s (%s:%d)\n",__func__, current->comm, current->pid);
 
        if (padapter) {
                pnetdev= padapter->pnetdev;
@@ -1013,7 +1013,7 @@ exit:
        #endif //CONFIG_RESUME_IN_WORKQUEUE
 
        pwrpriv->bInSuspend = false;
-       DBG_871X("<===  %s return %d.............. in %dms\n", __FUNCTION__
+       DBG_871X("<===  %s return %d.............. in %dms\n", __func__
                , ret, rtw_get_passing_time_ms(start_time));
 
        _func_exit_;
@@ -1265,9 +1265,9 @@ _adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
                        //usb_autopm_get_interface(adapter_to_dvobj(padapter)->pusbintf );//init pm_usage_cnt ,let it start from 1
 
                        #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,32))
-                       DBG_871X("%s...pm_usage_cnt(%d).....\n",__FUNCTION__,atomic_read(&(dvobj->pusbintf ->pm_usage_cnt)));
+                       DBG_871X("%s...pm_usage_cnt(%d).....\n",__func__,atomic_read(&(dvobj->pusbintf ->pm_usage_cnt)));
                        #else
-                       DBG_871X("%s...pm_usage_cnt(%d).....\n",__FUNCTION__,dvobj->pusbintf ->pm_usage_cnt);
+                       DBG_871X("%s...pm_usage_cnt(%d).....\n",__func__,dvobj->pusbintf ->pm_usage_cnt);
                        #endif
                }
        }
index 337eddf..9f48c2d 100755 (executable)
@@ -386,7 +386,7 @@ _func_enter_;
        {
                RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port_complete:bDriverStopped(%d) OR bSurpriseRemoved(%d)", padapter->bDriverStopped, padapter->bSurpriseRemoved));
                DBG_8192C("%s(): TX Warning! bDriverStopped(%d) OR bSurpriseRemoved(%d) bWritePortCancel(%d) pxmitbuf->ext_tag(%x)\n",
-               __FUNCTION__,padapter->bDriverStopped, padapter->bSurpriseRemoved,padapter->bReadPortCancel,pxmitbuf->ext_tag);
+               __func__,padapter->bDriverStopped, padapter->bSurpriseRemoved,padapter->bReadPortCancel,pxmitbuf->ext_tag);
 
                goto check_completion;
        }
@@ -475,7 +475,7 @@ _func_enter_;
 
        if ((padapter->bDriverStopped) || (padapter->bSurpriseRemoved) ||(padapter->pwrctrlpriv.pnp_bstop_trx)) {
                #ifdef DBG_TX
-               DBG_871X(" DBG_TX %s:%d bDriverStopped%d, bSurpriseRemoved:%d, pnp_bstop_trx:%d\n",__FUNCTION__, __LINE__
+               DBG_871X(" DBG_TX %s:%d bDriverStopped%d, bSurpriseRemoved:%d, pnp_bstop_trx:%d\n",__func__, __LINE__
                        ,padapter->bDriverStopped, padapter->bSurpriseRemoved, padapter->pwrctrlpriv.pnp_bstop_trx );
                #endif
                RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port:( padapter->bDriverStopped ||padapter->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx)!!!\n"));
index 6ccae13..208c786 100644 (file)
@@ -110,12 +110,12 @@ void rtw_set_tx_chksum_offload(struct sk_buff *pkt, struct pkt_attrib *pattrib)
                                 udp->check = 0;
 #endif
                         } else {
-                               DBG_871X("%s-%d TCP CSUM offload Error!!\n", __FUNCTION__, __LINE__);
+                               DBG_871X("%s-%d TCP CSUM offload Error!!\n", __func__, __LINE__);
                                 WARN_ON(1);     /* we need a WARN() */
                            }
                }
                else { // IP fragmentation case
-                       DBG_871X("%s-%d nr_frags != 0, using skb_checksum_help(skb);!!\n", __FUNCTION__, __LINE__);
+                       DBG_871X("%s-%d nr_frags != 0, using skb_checksum_help(skb);!!\n", __func__, __LINE__);
                        skb_checksum_help(skb);
                }
        }
@@ -251,7 +251,7 @@ static void rtw_check_xmit_resource(_adapter *padapter, struct sk_buff *pkt)
        if (padapter->registrypriv.wifi_spec) {
                /* No free space for Tx, tx_worker is too slow */
                if (pxmitpriv->hwxmits[queue].accnt > WMM_XMIT_THRESHOLD) {
-                       //DBG_871X("%s(): stop netif_subqueue[%d]\n", __FUNCTION__, queue);
+                       //DBG_871X("%s(): stop netif_subqueue[%d]\n", __func__, queue);
                        netif_stop_subqueue(padapter->pnetdev, queue);
                }
        } else {
@@ -301,13 +301,13 @@ int rtw_mlcst2unicst(_adapter *padapter, struct sk_buff *skb)
                        memcpy(newskb->data, psta->hwaddr, 6);
                        res = rtw_xmit(padapter, &newskb);
                        if (res < 0) {
-                               DBG_871X("%s()-%d: rtw_xmit() return error!\n", __FUNCTION__, __LINE__);
+                               DBG_871X("%s()-%d: rtw_xmit() return error!\n", __func__, __LINE__);
                                pxmitpriv->tx_drop++;
                                dev_kfree_skb_any(newskb);
                        } else
                                pxmitpriv->tx_pkts++;
                } else {
-                       DBG_871X("%s-%d: skb_copy() failed!\n", __FUNCTION__, __LINE__);
+                       DBG_871X("%s-%d: skb_copy() failed!\n", __func__, __LINE__);
                        pxmitpriv->tx_drop++;
 
                        _exit_critical_bh(&pstapriv->asoc_list_lock, &irqL);
@@ -343,7 +343,7 @@ _func_enter_;
        if (rtw_if_up(padapter) == false) {
                RT_TRACE(_module_xmit_osdep_c_, _drv_err_, ("rtw_xmit_entry: rtw_if_up fail\n"));
                #ifdef DBG_TX_DROP_FRAME
-               DBG_871X("DBG_TX_DROP_FRAME %s if_up fail\n", __FUNCTION__);
+               DBG_871X("DBG_TX_DROP_FRAME %s if_up fail\n", __func__);
                #endif
                goto drop_packet;
        }
@@ -366,7 +366,7 @@ _func_enter_;
        res = rtw_xmit(padapter, &pkt);
        if (res < 0) {
                #ifdef DBG_TX_DROP_FRAME
-               DBG_871X("DBG_TX_DROP_FRAME %s rtw_xmit fail\n", __FUNCTION__);
+               DBG_871X("DBG_TX_DROP_FRAME %s rtw_xmit fail\n", __func__);
                #endif
                goto drop_packet;
        }