Skip to content

Commit

Permalink
mt7615 & K2P: enable wps and apcli.
Browse files Browse the repository at this point in the history 
Enabling wps and apcli by fixing some mistakes in mt7615 driver.
In config file, some lines should be add:

CONFIG_WSC_INCLUDED=y
CONFIG_WSC_V2_SUPPORT=y
CONFIG_RT_WSC=y
CONFIG_RT_WSC_V2=y
# CONFIG_RT_WSC_NFC is not set
  • Loading branch information
@ferhung
ferhung committed Jun 10, 2019
1 parent 16272c4 commit 27f1e1e
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 13 deletions.
4 changes: 3 additions & 1 deletion trunk/configs/boards/K2P/kernel-3.4.x.config
View file
Expand Up @@ -2128,7 +2128,9 @@ CONFIG_RT_MAX_CLIENTS=48
# CONFIG_RT_DOT11K_RRM is not set
# CONFIG_RT_80211N_DRAFT3 is not set
# CONFIG_RT_80211W_PMF is not set
# CONFIG_RT_WSC is not set
CONFIG_RT_WSC=y
CONFIG_RT_WSC_V2=y
# CONFIG_RT_WSC_NFC is not set
# CONFIG_RT_ED_MONITOR is not set
CONFIG_RT_IGMP_SNOOP=y
# CONFIG_RT_MCAST_RATE_SPECIFIC is not set
Expand Down
16 changes: 8 additions & 8 deletions trunk/proprietary/rt_wifi/rtpci/4.4.X.X/mt7615/embedded/common/cmm_info.c
View file
Expand Up @@ -3273,7 +3273,7 @@ VOID RTMPCommSiteSurveyData(
else if (wireless_mode == Ndis802_11OFDM5_N)
sprintf(msg+strlen(msg),"%-7s", "11a/n");
else if (wireless_mode == Ndis802_11OFDM5_AC)
sprintf(msg+strlen(msg),"%-8s", "11a/n/ac");
sprintf(msg+strlen(msg),"%-7s", "11a/n/ac");
else if (wireless_mode == Ndis802_11OFDM24)
sprintf(msg+strlen(msg),"%-7s", "11b/g");
else if (wireless_mode == Ndis802_11OFDM24_N)
Expand Down Expand Up @@ -3722,10 +3722,10 @@ VOID RTMPIoctlGetSiteSurvey(
}

sprintf(msg,"%s","\n");
sprintf(msg+strlen(msg),"Total=%-4d, 2G=%d, 5G=%d",pAdapter->ScanTab.BssNr,bss_2G_cnt,bss_5G_cnt);
sprintf(msg+strlen(msg),"%s","\n");
//sprintf(msg+strlen(msg),"Total=%-4d, 2G=%d, 5G=%d",pAdapter->ScanTab.BssNr,bss_2G_cnt,bss_5G_cnt);
//sprintf(msg+strlen(msg),"%s","\n");
sprintf(msg+strlen(msg),"%-4s%-4s%-33s%-20s%-23s%-9s%-7s%-7s%-3s\n",
"No","Ch", "SSID", "BSSID", "Security", "Siganl(%)", "W-Mode", " ExtCH"," NT");
"No","Ch", "SSID", "BSSID", "Security", "Signal(%)", "W-Mode", " ExtCH"," NT");

#ifdef WSC_INCLUDED
sprintf(msg+strlen(msg)-1,"%-4s%-5s\n", " WPS", " DPID");
Expand Down Expand Up @@ -3784,7 +3784,7 @@ VOID RTMPIoctlGetSiteSurvey(
sprintf(msg+strlen(msg),"%-5s", " ");
#endif /* WSC_INCLUDED */

sprintf(msg+strlen(msg),"%-7s\n", pBss->FromBcnReport ? " YES" : " NO");
sprintf(msg+strlen(msg),"%-10s\n", pBss->FromBcnReport ? " YES" : " NO");

}

Expand Down Expand Up @@ -3864,8 +3864,8 @@ VOID RTMPIoctlGetSiteSurvey(
return;
}
sprintf(msg,"%s","\n");
sprintf(msg+strlen(msg),"Total=%-4d",pAdapter->ScanTab.BssNr);
sprintf(msg+strlen(msg),"%s","\n");
//sprintf(msg+strlen(msg),"Total=%-4d",pAdapter->ScanTab.BssNr);
//sprintf(msg+strlen(msg),"%s","\n");
sprintf(msg+strlen(msg),"%-4s%-4s%-33s%-20s%-23s%-9s%-7s%-7s%-3s\n",
"No","Ch", "SSID", "BSSID", "Security", "Siganl(%)", "W-Mode", " ExtCH"," NT");

Expand Down Expand Up @@ -3929,7 +3929,7 @@ VOID RTMPIoctlGetSiteSurvey(
sprintf(msg+strlen(msg),"%-5s", " ");
#endif /* WSC_INCLUDED */

sprintf(msg+strlen(msg),"%-7s\n", pBss->FromBcnReport ? " YES" : " NO");
sprintf(msg+strlen(msg),"%-10s\n", pBss->FromBcnReport ? " YES" : " NO");

}

Expand Down
23 changes: 19 additions & 4 deletions trunk/user/httpd/ralink.c
View file
Expand Up @@ -1449,8 +1449,13 @@ ej_wl_auth_list(int eid, webs_t wp, int argc, char **argv)
}


#if defined(USE_MT7615_AP)
#define SSURV_LINE_LEN (4+4+33+20+23+9+7+7+3+10) // No+Ch+SSID+BSSID+Security+Siganl+WiressMode+ExtCH+NetworkType+BcnRept
#define SSURV_LINE_LEN_WPS (4+4+33+20+23+9+7+7+3+4+5+10) // No+Ch+SSID+BSSID+Security+Siganl+WiressMode+ExtCH+NetworkType+WPS+DPID+BcnRept
#else
#define SSURV_LINE_LEN (4+33+20+23+9+7+7+3) // Channel+SSID+Bssid+Security+Signal+WiressMode+ExtCh+NetworkType
#define SSURV_LINE_LEN_WPS (4+33+20+23+9+7+7+3+4+5) // Channel+SSID+Bssid+Security+Signal+WiressMode+ExtCh+NetworkType+WPS+PIN
#endif

#if BOARD_HAS_5G_RADIO
int
Expand Down Expand Up @@ -1516,12 +1521,17 @@ ej_wl_scan_5g(int eid, webs_t wp, int argc, char **argv)
while (*sp && ((len - (sp-op)) >= 0))
{
memcpy(site_line, sp, line_len);

#if defined(USE_MT7615_AP)
memcpy(site_chnl, sp+4, 3);
memcpy(site_ssid, sp+8, 33);
memcpy(site_bssid, sp+41, 20);
memcpy(site_signal, sp+84, 9);
#else
memcpy(site_chnl, sp, 3);
memcpy(site_ssid, sp+4, 33);
memcpy(site_bssid, sp+37, 20);
memcpy(site_signal, sp+80, 9);

#endif
site_line[line_len] = '\0';
site_chnl[3] = '\0';
site_ssid[33] = '\0';
Expand Down Expand Up @@ -1618,12 +1628,17 @@ ej_wl_scan_2g(int eid, webs_t wp, int argc, char **argv)
while (*sp && ((len - (sp-op)) >= 0))
{
memcpy(site_line, sp, line_len);

#if defined(USE_MT7615_AP)
memcpy(site_chnl, sp+4, 3);
memcpy(site_ssid, sp+8, 33);
memcpy(site_bssid, sp+41, 20);
memcpy(site_signal, sp+84, 9);
#else
memcpy(site_chnl, sp, 3);
memcpy(site_ssid, sp+4, 33);
memcpy(site_bssid, sp+37, 20);
memcpy(site_signal, sp+80, 9);

#endif
site_line[line_len] = '\0';
site_chnl[3] = '\0';
site_ssid[33] = '\0';
Expand Down

0 comments on commit 27f1e1e

Please sign in to comment.