fix some bugs

YunHair · Feb 20, 2022 · 01694c8 · 01694c8
1 parent 8e8b12f
commit 01694c8
Show file tree

Hide file tree

Showing 132 changed files with 28,924 additions and 33 deletions.
diff --git a/trunk/linux-4.4.x/drivers/net/ethernet/raeth/raeth_config.h b/trunk/linux-4.4.x/drivers/net/ethernet/raeth/raeth_config.h
@@ -20,7 +20,7 @@
 
 #define CONFIG_RAETH_RW_PDMAPTR_FROM_VAR
 /*#define CONFIG_QDMA_QOS_WEB*/
-/*#define CONFIG_QDMA_QOS_MARK*/
+#define CONFIG_QDMA_QOS_MARK*
 
 #if !defined(CONFIG_SOC_MT7621)
 #define CONFIG_RAETH_NAPI
@@ -47,7 +47,7 @@
 /*CONFIG_RAETH_HW_VLAN_RX*/
 #define CONFIG_RAETH_TSO
 /*#define CONFIG_RAETH_ETHTOOL*/
-/*#define CONFIG_RAETH_QDMA*/
+#define CONFIG_RAETH_QDMA
 /*CONFIG_RAETH_QDMATX_QDMARX*/
 /*CONFIG_HW_SFQ*/
 #define CONFIG_RAETH_HW_IOCOHERENT

diff --git a/trunk/linux-4.4.x/net/nat/hw_nat/hwnat_ioctl.c b/trunk/linux-4.4.x/net/nat/hw_nat/hwnat_ioctl.c
@@ -25,9 +25,9 @@
 #include "mcast_tbl.h"
 #endif
 
-unsigned char bind_dir = BIDIRECTION;
-unsigned short lan_vid = CONFIG_RA_HW_NAT_LAN_VLANID;
-unsigned short wan_vid = CONFIG_RA_HW_NAT_WAN_VLANID;
+unsigned char bind_dir __read_mostly = BIDIRECTION;
+unsigned short lan_vid __read_mostly = CONFIG_RA_HW_NAT_LAN_VLANID;
+extern unsigned short wan_vid;
 int debug_level;
 
 #if defined (CONFIG_HW_NAT_IPI)

diff --git a/trunk/linux-4.4.x/net/nat/hw_nat/ra_nat.c b/trunk/linux-4.4.x/net/nat/hw_nat/ra_nat.c
@@ -49,6 +49,11 @@
 #include "util.h"
 #include "hwnat_ioctl.h"
 #include "hwnat_define.h"
+
+unsigned short wan_vid __read_mostly = CONFIG_RA_HW_NAT_WAN_VLANID;
+module_param(wan_vid, ushort, S_IRUGO|S_IWUSR);
+MODULE_PARM_DESC(wan_vid, "VLAN ID for WAN traffic");
+
 struct timer_list hwnat_clear_entry_timer;
 static void hwnat_clear_entry(unsigned long data)
 {

diff --git a/trunk/user/httpd/web_ex.c b/trunk/user/httpd/web_ex.c
@@ -2180,7 +2180,7 @@ static int shadowsocks_status_hook(int eid, webs_t wp, int argc, char **argv)
 		ss_status_code = pids("trojan");
 	}
 	if (ss_status_code == 0){
-		ss_status_code = pids("kumasocks");
+		ss_status_code = pids("ipt2socks");
 	}
 	websWrite(wp, "function shadowsocks_status() { return %d;}\n", ss_status_code);
 	int ss_tunnel_status_code = pids("ss-local");