Merge upstream/main into feat/webui-compression

This commit is contained in:
eraiza0816 committed 2026-09-07 15:36:46 +09:00
commit ead1c40aac
8 files changed
+72 -54

No files matched your search

+1 -1
View File
@@ -1012,7 +1012,7 @@ void httpd_appcall(void)
if (!authenticated && !(f_data[entry].start == FDATA_START_login_html
|| f_data[entry].start == FDATA_START_port_svg
|| f_data[entry].start == FDATA_START_sfp_svg
|| f_data[entry].start == FDATA_START_i18n_js
|| f_data[entry].start == FDATA_START_main_js
|| f_data[entry].start == FDATA_START_style_css)) {
send_to_login();
goto do_send;
+4
View File
@@ -359,6 +359,7 @@ void send_l2(uint16_t idx)
while (1) {
entries_left--;
uint8_t port = 0;
uint8_t lag;
reg_read_m(RTL837x_TBL_DATA_0);
REG_WRITE(RTL837x_TBL_DATA_0, sfr_data[0], sfr_data[1] & 0xfc, sfr_data[2] | (TBL_LUTREAD_NEXT_L2UC << 6), sfr_data[3]);
@@ -402,6 +403,9 @@ void send_l2(uint16_t idx)
port |= (sfr_data[3] & 0x3) << 2;
itoa_html(port);
slen += strtox(outbuf + slen, ",\"lag\":");
lag = port_lag_of(port);
itoa_html(lag == PORT_LAG_NONE ? 0 : lag + 1);
}
// Index