httpd: moved Asuswrt-Merlin specific code out of web-broadcom.c; resy…

…nc web-broadcom.c with 45581
gnuton · Nov 3, 2021 · d00f214 · d00f214
1 parent 1be8cba
commit d00f214
Show file tree

Hide file tree

Showing 5 changed files with 848 additions and 787 deletions.
diff --git a/release/src/router/httpd/Makefile b/release/src/router/httpd/Makefile
@@ -116,7 +116,7 @@ OBJS = httpd.o cgi.o ej.o
 OBJS += web.o common.o nvram_f.o 
 OBJS += aspbw.o initial_web_hook.o
 OBJS += apps.o
-OBJS += sysinfo.o data_arrays.o
+OBJS += sysinfo.o data_arrays.o web-broadcom-am.o
 
 ifeq ($(CONFIG_REALTEK),y)
 OBJS += web-realtek.o

diff --git a/release/src/router/httpd/httpd.h b/release/src/router/httpd/httpd.h
@@ -467,8 +467,8 @@ extern int ej_wl_status(int eid, webs_t wp, int argc, char_t **argv, int unit);
 extern int ej_wl_status_2g(int eid, webs_t wp, int argc, char_t **argv);
 extern int ej_wps_info_2g(int eid, webs_t wp, int argc, char_t **argv);
 extern int ej_wps_info(int eid, webs_t wp, int argc, char_t **argv);
-extern int ej_wl_status_array(int eid, webs_t wp, int argc, char_t **argv, int unit);
-extern int ej_wl_status_2g_array(int eid, webs_t wp, int argc, char_t **argv);
+extern int ej_wl_unit_status_array(int eid, webs_t wp, int argc, char_t **argv, int unit);
+extern int ej_wl_status_array(int eid, webs_t wp, int argc, char_t **argv);
 extern const char *syslog_msg_filter[];
 
 /* web.c/web-*.c */