code.vuplus.com Git - vuplus_openvuplus_3.0/blob - meta-openvuplus/recipes-connectivity/ralink/rt3070-2.5.0.3/change_device_name_wlan_from_ra.patch

   1 diff --git a/common/cmm_wpa.c b/common/cmm_wpa.c
   2 index f5692dc..4670ffa 100644
   3 --- a/common/cmm_wpa.c
   4 +++ b/common/cmm_wpa.c
   5 @@ -4050,7 +4050,7 @@ VOID WPAInstallSharedKey(
   6                 pSharedKey->CipherAlg = CIPHER_AES;
   7         else
   8         {
   9 -               DBGPRINT(RT_DEBUG_ERROR, ("%s : fails (IF/ra%d) \n",
  10 +               DBGPRINT(RT_DEBUG_ERROR, ("%s : fails (IF/wlan%d) \n",
  11                                                                                 __FUNCTION__, BssIdx));
  12                 return;
  13         }
  14 @@ -4062,7 +4062,7 @@ VOID WPAInstallSharedKey(
  15                 /* Sanity check the length */
  16                 if ((GtkLen != LEN_WEP64) && (GtkLen != LEN_WEP128))
  17                 {
  18 -                       DBGPRINT(RT_DEBUG_ERROR, ("%s : (IF/ra%d) WEP key invlaid(%d) \n",
  19 +                       DBGPRINT(RT_DEBUG_ERROR, ("%s : (IF/wlan%d) WEP key invlaid(%d) \n",
  20                                                                                 __FUNCTION__, BssIdx, GtkLen));
  21                         return;
  22                 }
  23 @@ -4075,7 +4075,7 @@ VOID WPAInstallSharedKey(
  24                 /* Sanity check the length */
  25                 if (GtkLen < LEN_TK)
  26                 {
  27 -                       DBGPRINT(RT_DEBUG_ERROR, ("%s : (IF/ra%d) WPA key invlaid(%d) \n",
  28 +                       DBGPRINT(RT_DEBUG_ERROR, ("%s : (IF/wlan%d) WPA key invlaid(%d) \n",
  29                                                                                 __FUNCTION__, BssIdx, GtkLen));
  30                         return;
  31                 }
  32 diff --git a/include/rtmp_def.h b/include/rtmp_def.h
  33 index 9025630..81518f7 100644
  34 --- a/include/rtmp_def.h
  35 +++ b/include/rtmp_def.h
  36 @@ -1473,8 +1473,8 @@
  37  #define IS_OPMODE_AP(_x)               ((_x)->OpMode == OPMODE_AP)
  38  #define IS_OPMODE_STA(_x)              ((_x)->OpMode == OPMODE_STA)
  39
  40 -#define INF_MAIN_DEV_NAME              "ra"
  41 -#define INF_MBSSID_DEV_NAME            "ra"
  42 +#define INF_MAIN_DEV_NAME              "wlan"
  43 +#define INF_MBSSID_DEV_NAME            "wlan"
  44  #define INF_WDS_DEV_NAME               "wds"
  45  #define INF_APCLI_DEV_NAME             "apcli"
  46  #define INF_MESH_DEV_NAME              "mesh"
  47 diff --git a/os/linux/rt_profile.c b/os/linux/rt_profile.c
  48 index f3e45dc..4e8eb3d 100644
  49 --- a/os/linux/rt_profile.c
  50 +++ b/os/linux/rt_profile.c
  51 @@ -162,7 +162,7 @@ NDIS_STATUS RTMPReadParametersHook(
  52                 for (i = 0; i < pAd->ApCfg.BssidNum; i++)
  53                 {
  54                         pAd->ApCfg.MBSSID[i].Hostapd=FALSE;
  55 -                       DBGPRINT(RT_DEBUG_TRACE, ("Reset ra%d hostapd support=FLASE", i));
  56 +                       DBGPRINT(RT_DEBUG_TRACE, ("Reset wlan%d hostapd support=FLASE", i));
  57
  58                 }
  59  #endif /*HOSTAPD_SUPPORT */
  60 @@ -255,7 +255,7 @@ VOID RtmpDrvSendWirelessEvent(
  61                 if (pAddr)
  62                         pBufPtr += sprintf(pBufPtr, "(RT2860) STA(%02x:%02x:%02x:%02x:%02x:%02x) ", PRINT_MAC(pAddr));
  63                 else if (BssIdx < MAX_MBSSID_NUM(pAd))
  64 -                       pBufPtr += sprintf(pBufPtr, "(RT2860) BSS(ra%d) ", BssIdx);
  65 +                       pBufPtr += sprintf(pBufPtr, "(RT2860) BSS(wlan%d) ", BssIdx);
  66                 else
  67                         pBufPtr += sprintf(pBufPtr, "(RT2860) ");
  68