Merge commit 'v2.6.29-rc1' into irq/urgent

[linux-2.6-omap-h63xx.git] / drivers / staging / rt2860 / rt_profile.c

diff --git a/drivers/staging/rt2860/rt_profile.c b/drivers/staging/rt2860/rt_profile.c
index cd7ffc8a6e8a6d90cf1f69f32192b54ce8bf9d50..326a3cb52b9cf229d42e82ce8621fdd94d4562d1 100644 (file)
--- a/drivers/staging/rt2860/rt_profile.c
+++ b/drivers/staging/rt2860/rt_profile.c
@@ -1024,7 +1024,7 @@ NDIS_STATUS       RTMPReadParametersHook(
                                                                pAd->MlmeAux.SsidLen = pAd->CommonCfg.SsidLen;
                                                                NdisZeroMemory(pAd->MlmeAux.Ssid, NDIS_802_11_LENGTH_SSID);
                                                                NdisMoveMemory(pAd->MlmeAux.Ssid, tmpbuf, pAd->MlmeAux.SsidLen);
-                                                               DBGPRINT(RT_DEBUG_TRACE, ("%s::(SSID=%s)\n", __FUNCTION__, tmpbuf));
+                                                               DBGPRINT(RT_DEBUG_TRACE, ("%s::(SSID=%s)\n", __func__, tmpbuf));
                                                        }
                                                }
                                        }
@@ -1043,7 +1043,7 @@ NDIS_STATUS       RTMPReadParametersHook(
                                                                pAd->StaCfg.BssType = BSS_INFRA;
                                                        // Reset Ralink supplicant to not use, it will be set to start when UI set PMK key
                                                        pAd->StaCfg.WpaState = SS_NOTUSE;
-                                                       DBGPRINT(RT_DEBUG_TRACE, ("%s::(NetworkType=%d)\n", __FUNCTION__, pAd->StaCfg.BssType));
+                                                       DBGPRINT(RT_DEBUG_TRACE, ("%s::(NetworkType=%d)\n", __func__, pAd->StaCfg.BssType));
                                                }
                                        }
 #endif // CONFIG_STA_SUPPORT //
@@ -1337,7 +1337,7 @@ NDIS_STATUS       RTMPReadParametersHook(
 
                                                        pAd->StaCfg.PortSecured = WPA_802_1X_PORT_NOT_SECURED;
 
-                                                       DBGPRINT(RT_DEBUG_TRACE, ("%s::(EncrypType=%d)\n", __FUNCTION__, pAd->StaCfg.WepStatus));
+                                                       DBGPRINT(RT_DEBUG_TRACE, ("%s::(EncrypType=%d)\n", __func__, pAd->StaCfg.WepStatus));
                                                }
 #endif // CONFIG_STA_SUPPORT //
                                        }
@@ -1363,7 +1363,7 @@ NDIS_STATUS       RTMPReadParametersHook(
                                                        pAd->StaCfg.OrigWepStatus       = pAd->StaCfg.WepStatus;
                                                        pAd->StaCfg.bMixCipher          = FALSE;
 
-                                                       DBGPRINT(RT_DEBUG_TRACE, ("%s::(EncrypType=%d)\n", __FUNCTION__, pAd->StaCfg.WepStatus));
+                                                       DBGPRINT(RT_DEBUG_TRACE, ("%s::(EncrypType=%d)\n", __func__, pAd->StaCfg.WepStatus));
                                                }
 #endif // CONFIG_STA_SUPPORT //
                                        }
@@ -1400,7 +1400,7 @@ NDIS_STATUS       RTMPReadParametersHook(
                                                        else
                                                        {
                                                                err = 1;
-                                                               DBGPRINT(RT_DEBUG_ERROR, ("%s::(WPAPSK key-string required 8 ~ 64 characters!)\n", __FUNCTION__));
+                                                               DBGPRINT(RT_DEBUG_ERROR, ("%s::(WPAPSK key-string required 8 ~ 64 characters!)\n", __func__));
                                                        }
 
                                                        if (err == 0)
@@ -1416,7 +1416,7 @@ NDIS_STATUS       RTMPReadParametersHook(
                                                                        pAd->StaCfg.WpaState = SS_NOTUSE;
                                                                }
 
-                                                               DBGPRINT(RT_DEBUG_TRACE, ("%s::(WPAPSK=%s)\n", __FUNCTION__, tmpbuf));
+                                                               DBGPRINT(RT_DEBUG_TRACE, ("%s::(WPAPSK=%s)\n", __func__, tmpbuf));
                                                        }
                                                }
                                        }