Merge Lean's source

2020-03-24 04:47:40 +08:00 · 2020-03-24 04:47:40 +08:00 · c73762f9cd
commit c73762f9cd
parent 548d409854 9cbca25d79
22 changed files with 84 additions and 13698 deletions
--- a/README.md
+++ b/README.md
@ -46,5 +46,8 @@ Default login address: 192.168.1.1, username is **root** and password is **passw
 # Contributed
 ### See [CONTRIBUTED.md](https://github.com/project-openwrt/openwrt/blob/master/CONTRIBUTED.md).

+# Donate
+ETH Address: `0x373Ba17dF77ea455bd29a24104088659fBac7e96`
+
 # License
 ### [GNU General Public License v3.0](https://github.com/project-openwrt/openwrt/blob/master/LICENSE).
--- a/doc/alipay_donate.jpg
+++ b/doc/alipay_donate.jpg
--- a/doc/wechat_donate.jpg
+++ b/doc/wechat_donate.jpg
--- a/package/ctcgfw/luci-app-frps/Makefile
+++ b/package/ctcgfw/luci-app-frps/Makefile
@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=luci-app-frps
 PKG_VERSION:=0.0.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
@ -15,9 +15,25 @@ PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=lwz322 <lwz322@qq.com>

 LUCI_TITLE:=LuCI support for Frps
+LUCI_DEPENDS:=+wget +frps
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+frps
+
+define Package/$(PKG_NAME)/conffiles
+/etc/config/frps
+endef

 include $(TOPDIR)/feeds/luci/luci.mk

+define Package/$(PKG_NAME)/postinst
+#!/bin/sh
+if [ -z "$${IPKG_INSTROOT}" ]; then
+	( . /etc/uci-defaults/40_luci-frps ) && rm -f /etc/uci-defaults/40_luci-frps
+fi
+
+chmod 755 "$${IPKG_INSTROOT}/etc/init.d/frps" >/dev/null 2>&1
+ln -sf "../init.d/frps" \
+	"$${IPKG_INSTROOT}/etc/rc.d/S99frps" >/dev/null 2>&1
+exit 0
+endef
+
 # call BuildPackage - OpenWrt buildroot signature
--- a/package/ctcgfw/luci-app-frps/po/zh-cn/frps.po
+++ b/package/ctcgfw/luci-app-frps/po/zh-cn/frps.po
@ -175,6 +175,8 @@ msgstr "TCP 复用"
 #: luasrc/model/cbi/frps/server.lua:27
 msgid "Enforce frps only accept TLS connection"
 msgstr "强制frps只接受TLS连接"
+
+#: luasrc/model/cbi/frps/server.lua:28
 msgid "Requirements: frpc v0.25.0+, frps v0.32.0+"
 msgstr "要求：frpc版本0.25.0+, frps版本0.32.0+"

@ -241,5 +243,7 @@ msgstr "虚拟主机https绑定端口"
 #: luasrc/model/cbi/frps/server.lua:50
 msgid "Extra Settings"
 msgstr "额外设置"
+
+#: luasrc/model/cbi/frps/server.lua:51
 msgid "List of extra settings will be added to config file. Format: option=value, eg. <code>detailed_errors_to_client=false</code>.(NO SPACE!)"
 msgstr "额外设置列表将会被添加到config文件中。 格式：option=value，如：<code>detailed_errors_to_client=false</code>.(不含空格!)"
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@ -1343,6 +1343,21 @@ endef
 $(eval $(call KernelPackage,usb-net-rtl8150))


+define KernelPackage/usb-net-rtl8152
+  TITLE:=Kernel module for USB-to-Ethernet Realtek convertors
+  KCONFIG:=CONFIG_USB_RTL8152
+  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/r8152.ko
+  AUTOLOAD:=$(call AutoProbe,r8152)
+  $(call AddDepends/usb-net)
+endef
+
+define KernelPackage/usb-net-rtl8152/description
+ Kernel module for USB-to-Ethernet Realtek 8152 USB2.0/3.0 convertors
+endef
+
+$(eval $(call KernelPackage,usb-net-rtl8152))
+
+
 define KernelPackage/usb-net-sr9700
  TITLE:=Support for CoreChip SR9700 ethernet devices
  KCONFIG:=CONFIG_USB_NET_SR9700
--- a/package/lean/luci-app-ssr-plus/Makefile
+++ b/package/lean/luci-app-ssr-plus/Makefile
@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=luci-app-ssr-plus
 PKG_VERSION:=173
-PKG_RELEASE:=3
+PKG_RELEASE:=6

 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)

--- a/package/lean/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua
+++ b/package/lean/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua
@ -47,9 +47,9 @@ function act_ping()
 	socket:setopt("socket", "sndtimeo", 3)
 	e.socket = socket:connect(domain, port)
 	socket:close()
-	e.ping = luci.sys.exec(string.format("echo -n $(tcpping -c 1 -i 1 -p %s %s 2>&1 | grep -o 'time=[0-9]*.[0-9]' | awk -F '=' '{print$2}') 2>/dev/null",port, domain))
+	e.ping = luci.sys.exec("ping -c 1 -W 1 %q 2>&1 | grep -o 'time=[0-9]*.[0-9]' | awk -F '=' '{print$2}'" % domain)
 	if (e.ping == "") then
-    e.ping = luci.sys.exec("ping -c 1 -W 1 %q 2>&1 | grep -o 'time=[0-9]*.[0-9]' | awk -F '=' '{print$2}'" % domain)
+		e.ping = luci.sys.exec(string.format("echo -n $(tcpping -c 1 -i 1 -p %s %s 2>&1 | grep -o 'ttl=[0-9]* time=[0-9]*.[0-9]' | awk -F '=' '{print$3}') 2>/dev/null",port, domain))
  end
 	if (iret == 0) then
 		luci.sys.call(" ipset del ss_spec_wan_ac " .. domain)
--- a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua
+++ b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua
@ -46,11 +46,12 @@ o:depends("enable_switch", "1")
 o.default = 3

 o = s:option(Value, "chnroute_url", translate("Chnroute Update url"))
-o:value("https://ispip.clang.cn/all_cn.txt", translate("https://ispip.clang.cn/all_cn.txt"))
+o:value("https://ispip.clang.cn/all_cn.txt", translate("Clang.CN"))
 o.default = "https://ispip.clang.cn/all_cn.txt"

 o = s:option(Value, "nfip_url", translate("nfip_url"))
-o:value("https://raw.githubusercontent.com/QiuSimons/Netflix_IP/master/NF_only.txt", translate("https://raw.githubusercontent.com/QiuSimons/Netflix_IP/master/NF_only.txt"))
+o:value("https://raw.githubusercontent.com/QiuSimons/Netflix_IP/master/NF_only.txt", translate("Netflix IP Only"))
+o:value("https://raw.githubusercontent.com/QiuSimons/Netflix_IP/master/getflix.txt", translate("Netflix and AWS"))
 o.default = "https://raw.githubusercontent.com/QiuSimons/Netflix_IP/master/NF_only.txt"
 o.description = translate("Customize Netflix IP Url")

@ -58,7 +59,7 @@ o = s:option(Flag, "adblock", translate("Enable adblock"))
 o.rmempty = false

 o = s:option(Value, "adblock_url", translate("adblock_url"))
-o:value("https://gitee.com/privacy-protection-tools/anti-ad/raw/master/anti-ad-for-dnsmasq.conf", translate("https://gitee.com/privacy-protection-tools/anti-ad/raw/master/anti-ad-for-dnsmasq.conf"))
+o:value("https://gitee.com/privacy-protection-tools/anti-ad/raw/master/anti-ad-for-dnsmasq.conf", translate("anti-AD"))
 o.default = "https://gitee.com/privacy-protection-tools/anti-ad/raw/master/anti-ad-for-dnsmasq.conf"
 o:depends("adblock", "1")
 o.description = translate("Support AdGuardHome and DNSMASQ format list")
--- a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/status.lua
+++ b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/status.lua
@ -67,7 +67,7 @@ if luci.sys.call("busybox ps -w | grep ssr-retcp | grep -v grep >/dev/null") ==
 redir_run=1
 end

-if luci.sys.call("busybox ps -w | grep ssr-local | grep -v grep >/dev/null") == 0 then
+if luci.sys.call("busybox ps -w | grep ssr-local | grep -v ssr-socksdns |grep -v grep >/dev/null") == 0 then
 sock5_run=1
 end

--- a/package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/server_list.htm
+++ b/package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/server_list.htm
@ -45,7 +45,7 @@ local dsp = require "luci.dispatcher"
 			xhr(task).then(thread);
 		}
 	}
-	for (let i = 0; i < 10; i++) {
+	for (let i = 0; i < 20; i++) {
 		thread()
 	}
 	
--- a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
+++ b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
@ -656,7 +656,17 @@ start() {
        ipset add netflix $nip 2>/dev/null
      done
    else
-      rm -f /tmp/dnsmasq.ssr/netflix_forward.conf
+      cat /etc/config/netflix.list | while read line || [ -n "$line" ]; 
+      do
+        sed -i "/$line/d" /tmp/dnsmasq.ssr/gfw_list.conf
+      done
+      awk '!/^$/&&!/^#/{printf("ipset=/.%s/'"netflix"'\n",$0)}' /etc/config/netflix.list > /tmp/dnsmasq.ssr/netflix_forward.conf
+      awk '!/^$/&&!/^#/{printf("server=/.%s/'"127.0.0.1#5335"'\n",$0)}' /etc/config/netflix.list >> /tmp/dnsmasq.ssr/netflix_forward.conf
+      ipset -N netflix hash:net 2>/dev/null
+      cat /etc/config/netflixip.list | while read nip || [ -n "$nip" ]; 
+      do
+        ipset add netflix $nip 2>/dev/null
+      done
    fi
 		
 		/etc/init.d/dnsmasq restart >/dev/null 2>&1
--- a/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-rules
+++ b/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-rules
@ -127,6 +127,8 @@ ipset_r() {
    else
      ipset -! add whitelist $NETFLIX_IP
    fi
+  else
+    $IPT -I SS_SPEC_WAN_AC -p tcp -m set --match-set netflix dst -j REDIRECT --to-ports $local_port
 	fi

 	return $?
--- a/package/lean/r8152/Makefile
+++ b/package/lean/r8152/Makefile
@ -1,47 +0,0 @@
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=usb-net-rtl8152
-PKG_VERSION:=2.12.0
-PKG_RELEASE:=2
-
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define KernelPackage/usb-net-rtl8152
-  TITLE:=Driver for Realtek r8152 chipsets
-  DEPENDS:=@USB_SUPPORT +kmod-usb-core
-  SUBMENU:=Network Devices
-  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
-  FILES:= $(PKG_BUILD_DIR)/r8152.ko
-  AUTOLOAD:=$(call AutoProbe,r8152)
-endef
-
-define Package/usb-net-rtl8152/description
- This package contains a driver for Realtek r8152 chipsets.
-endef
-
-R8152_MAKEOPTS= -C $(PKG_BUILD_DIR) \
-		PATH="$(TARGET_PATH)" \
-		ARCH="$(LINUX_KARCH)" \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		TARGET="$(HAL_TARGET)" \
-		TOOLPREFIX="$(KERNEL_CROSS)" \
-		TOOLPATH="$(KERNEL_CROSS)" \
-		KERNELPATH="$(LINUX_DIR)" \
-		KERNELDIR="$(LINUX_DIR)" \
-		LDOPTS=" " \
-		DOMULTI=1
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-	$(CP) ./src/* $(PKG_BUILD_DIR)
-endef
-
-define Build/Compile
-	$(MAKE) $(R8152_MAKEOPTS) modules
-endef
-
-$(eval $(call KernelPackage,usb-net-rtl8152))
--- a/package/lean/r8152/src/50-usb-realtek-net.rules
+++ b/package/lean/r8152/src/50-usb-realtek-net.rules
@ -1,38 +0,0 @@
-# This is used to change the default configuration of Realtek USB ethernet adapters
-
-ACTION!="add", GOTO="usb_realtek_net_end"
-SUBSYSTEM!="usb", GOTO="usb_realtek_net_end"
-ENV{DEVTYPE}!="usb_device", GOTO="usb_realtek_net_end"
-
-# Modify this to change the default value
-ENV{REALTEK_NIC_MODE}="1"
-
-# Realtek
-ATTR{idVendor}=="0bda", ATTR{idProduct}=="8156", ATTR{bConfigurationValue}!="$env{REALTEK_NIC_MODE}", ATTR{bConfigurationValue}="$env{REALTEK_NIC_MODE}"
-ATTR{idVendor}=="0bda", ATTR{idProduct}=="8153", ATTR{bConfigurationValue}!="$env{REALTEK_NIC_MODE}", ATTR{bConfigurationValue}="$env{REALTEK_NIC_MODE}"
-ATTR{idVendor}=="0bda", ATTR{idProduct}=="8152", ATTR{bConfigurationValue}!="$env{REALTEK_NIC_MODE}", ATTR{bConfigurationValue}="$env{REALTEK_NIC_MODE}"
-
-# Samsung
-ATTR{idVendor}=="04e8", ATTR{idProduct}=="a101", ATTR{bConfigurationValue}!="$env{REALTEK_NIC_MODE}", ATTR{bConfigurationValue}="$env{REALTEK_NIC_MODE}"
-
-# Lenovo
-ATTR{idVendor}=="17ef", ATTR{idProduct}=="304f", ATTR{bConfigurationValue}!="$env{REALTEK_NIC_MODE}", ATTR{bConfigurationValue}="$env{REALTEK_NIC_MODE}"
-ATTR{idVendor}=="17ef", ATTR{idProduct}=="3052", ATTR{bConfigurationValue}!="$env{REALTEK_NIC_MODE}", ATTR{bConfigurationValue}="$env{REALTEK_NIC_MODE}"
-ATTR{idVendor}=="17ef", ATTR{idProduct}=="3054", ATTR{bConfigurationValue}!="$env{REALTEK_NIC_MODE}", ATTR{bConfigurationValue}="$env{REALTEK_NIC_MODE}"
-ATTR{idVendor}=="17ef", ATTR{idProduct}=="3057", ATTR{bConfigurationValue}!="$env{REALTEK_NIC_MODE}", ATTR{bConfigurationValue}="$env{REALTEK_NIC_MODE}"
-ATTR{idVendor}=="17ef", ATTR{idProduct}=="3082", ATTR{bConfigurationValue}!="$env{REALTEK_NIC_MODE}", ATTR{bConfigurationValue}="$env{REALTEK_NIC_MODE}"
-ATTR{idVendor}=="17ef", ATTR{idProduct}=="7205", ATTR{bConfigurationValue}!="$env{REALTEK_NIC_MODE}", ATTR{bConfigurationValue}="$env{REALTEK_NIC_MODE}"
-ATTR{idVendor}=="17ef", ATTR{idProduct}=="720a", ATTR{bConfigurationValue}!="$env{REALTEK_NIC_MODE}", ATTR{bConfigurationValue}="$env{REALTEK_NIC_MODE}"
-ATTR{idVendor}=="17ef", ATTR{idProduct}=="720b", ATTR{bConfigurationValue}!="$env{REALTEK_NIC_MODE}", ATTR{bConfigurationValue}="$env{REALTEK_NIC_MODE}"
-ATTR{idVendor}=="17ef", ATTR{idProduct}=="720c", ATTR{bConfigurationValue}!="$env{REALTEK_NIC_MODE}", ATTR{bConfigurationValue}="$env{REALTEK_NIC_MODE}"
-ATTR{idVendor}=="17ef", ATTR{idProduct}=="721e", ATTR{bConfigurationValue}!="$env{REALTEK_NIC_MODE}", ATTR{bConfigurationValue}="$env{REALTEK_NIC_MODE}"
-ATTR{idVendor}=="17ef", ATTR{idProduct}=="a359", ATTR{bConfigurationValue}!="$env{REALTEK_NIC_MODE}", ATTR{bConfigurationValue}="$env{REALTEK_NIC_MODE}"
-ATTR{idVendor}=="17ef", ATTR{idProduct}=="a387", ATTR{bConfigurationValue}!="$env{REALTEK_NIC_MODE}", ATTR{bConfigurationValue}="$env{REALTEK_NIC_MODE}"
-
-# TP-LINK
-ATTR{idVendor}=="2357", ATTR{idProduct}=="0601", ATTR{bConfigurationValue}!="$env{REALTEK_NIC_MODE}", ATTR{bConfigurationValue}="$env{REALTEK_NIC_MODE}"
-
-# Nvidia
-ATTR{idVendor}=="0955", ATTR{idProduct}=="09ff", ATTR{bConfigurationValue}!="$env{REALTEK_NIC_MODE}", ATTR{bConfigurationValue}="$env{REALTEK_NIC_MODE}"
-
-LABEL="usb_realtek_net_end"
--- a/package/lean/r8152/src/Makefile
+++ b/package/lean/r8152/src/Makefile
@ -1,49 +0,0 @@
-#
-#
-#
-
-CONFIG_CTAP_SHORT = ON
-
-ifneq ($(KERNELRELEASE),)
-	obj-m	 := r8152.o
-#	EXTRA_CFLAGS += -DRTL8152_S5_WOL
-#	EXTRA_CFLAGS += -DRTL8152_DEBUG
-	ifneq (,$(filter OFF off, $(CONFIG_CTAP_SHORT)))
-		EXTRA_CFLAGS += -DCONFIG_CTAP_SHORT_OFF
-	endif
-else
-	KERNELDIR ?= /lib/modules/$(shell uname -r)/build
-	PWD :=$(shell pwd)
-	TARGET_PATH := kernel/drivers/net/usb
-	INBOXDRIVER := $(shell find $(subst build,$(TARGET_PATH),$(KERNELDIR)) -name r8152.ko.* -type f)
-	RULEFILE = 50-usb-realtek-net.rules
-	RULEDIR = /etc/udev/rules.d/
-
-.PHONY: modules
-modules:
-	$(MAKE) -C $(KERNELDIR) M=$(PWD) modules
-
-.PHONY: all
-all: clean modules install
-
-.PHONY: clean
-clean:
-	$(MAKE) -C $(KERNELDIR) M=$(PWD) clean
-
-.PHONY: install
-install:
-ifneq ($(shell lsmod | grep r8152),)
-	rmmod r8152
-endif
-ifneq ($(INBOXDRIVER),)
-	rm -f $(INBOXDRIVER)
-endif
-	$(MAKE) -C $(KERNELDIR) M=$(PWD) INSTALL_MOD_DIR=$(TARGET_PATH) modules_install
-	modprobe r8152
-
-.PHONY: install_rules
-install_rules:
-	install --group=root --owner=root --mode=0644 $(RULEFILE) $(RULEDIR)
-
-endif
-
--- a/package/lean/r8152/src/ReadMe.txt
+++ b/package/lean/r8152/src/ReadMe.txt
@ -1,28 +0,0 @@
- If you want to support S5 WOL, you have to find
-
-	EXTRA_CFLAGS += -DRTL8152_S5_WOL
-
-  in the Makefile. Then, remove the first character '#", if it exists.
-
-
- For Fedora, you may have to run the following command after installing the
-  driver.
-
-	# dracut -f
-
- For Ubuntu, you may have to run the following command after installing the
-  driver.
-
-	# sudo depmod -a
-	# sudo update-initramfs -u
-
- Example of setting speed
-
-	# ethtool -s eth0 autoneg on advertise 0x802f (2.5G)
-	# ethtool -s eth0 autoneg on advertise 0x002f (1G)
-	# ethtool -s eth0 autoneg on advertise 0x000f (100M full)
-	# ethtool -s eth0 autoneg on advertise 0x0003 (10M full)
-
- Disable center tap short
-
-	# make CONFIG_CTAP_SHORT=OFF modules
--- a/package/lean/r8152/src/compatibility.h
+++ b/package/lean/r8152/src/compatibility.h
@ -1,508 +0,0 @@
-#ifndef LINUX_COMPATIBILITY_H
-#define LINUX_COMPATIBILITY_H
-
-/*
- * Definition and macro
- */
-
-#include <linux/init.h>
-#include <linux/version.h>
-#include <linux/in.h>
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
-	#include <linux/mdio.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
-	#include <uapi/linux/mdio.h>
-#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) */
-#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31) */
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4,12,0)
-	#define SPEED_2500				2500
-	#define SPEED_25000				25000
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4,9,0)
-	#define BMCR_SPEED10				0x0000
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4,5,0)
-	#define NETIF_F_CSUM_MASK			NETIF_F_ALL_CSUM
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4,1,0)
-	#define IS_REACHABLE(option)			(defined(option) || \
-							 (defined(option##_MODULE) && defined(MODULE)))
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
-	#define skb_vlan_tag_present(__skb)		vlan_tx_tag_present(__skb)
-	#define skb_vlan_tag_get(__skb)			vlan_tx_tag_get(__skb)
-	#define skb_vlan_tag_get_id(__skb)		vlan_tx_tag_get_id(__skb)
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)
-	#define napi_alloc_skb(napi, length)		netdev_alloc_skb_ip_align(netdev,length)
-	#define napi_complete_done(n, d)		napi_complete(n)
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0)
-	#ifndef smp_mb__before_atomic
-	#define smp_mb__before_atomic()			smp_mb()
-	#endif
-
-	#ifndef smp_mb__after_atomic
-	#define smp_mb__after_atomic()			smp_mb()
-	#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0)
-	#define IS_ERR_OR_NULL(ptr)			(!ptr)
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0)
-	#define ether_addr_copy(dst, src)		memcpy(dst, src, ETH_ALEN)
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0)
-	#define BIT(nr)					(1UL << (nr))
-	#define BIT_ULL(nr)				(1ULL << (nr))
-	#define BITS_PER_BYTE				8
-	#define reinit_completion(x)			((x)->done = 0)
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
-	#define NETIF_F_HW_VLAN_CTAG_RX			NETIF_F_HW_VLAN_RX
-	#define NETIF_F_HW_VLAN_CTAG_TX			NETIF_F_HW_VLAN_TX
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)
-	#define USB_DEVICE_INTERFACE_CLASS(vend, prod, iclass) \
-		USB_DEVICE_AND_INTERFACE_INFO(vend, prod, iclass, 0xff, 0)
-
-	static inline __sum16 tcp_v6_check(int len,
-					   const struct in6_addr *saddr,
-					   const struct in6_addr *daddr,
-					   __wsum base)
-	{
-		return csum_ipv6_magic(saddr, daddr, len, IPPROTO_TCP, base);
-	}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
-	#ifndef SPEED_UNKNOWN
-		#define SPEED_UNKNOWN		0
-	#endif
-
-	#ifndef DUPLEX_UNKNOWN
-		#define DUPLEX_UNKNOWN		0xff
-	#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0)
-	#define eth_random_addr(addr)			random_ether_addr(addr)
-	#define usb_enable_lpm(udev)
-	#define MDIO_EEE_100TX				MDIO_AN_EEE_ADV_100TX	/* 100TX EEE cap */
-	#define MDIO_EEE_1000T				MDIO_AN_EEE_ADV_1000T	/* 1000T EEE cap */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)
-	#define ETH_MDIO_SUPPORTS_C22			MDIO_SUPPORTS_C22
-
-	static inline void eth_hw_addr_random(struct net_device *dev)
-	{
-		random_ether_addr(dev->dev_addr);
-	}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
-	#define module_usb_driver(__driver) \
-	static int __init __driver##_init(void) \
-	{ \
-		return usb_register(&(__driver)); \
-	} \
-	module_init(__driver##_init); \
-	static void __exit __driver##_exit(void) \
-	{ \
-		usb_deregister(&(__driver)); \
-	} \
-	module_exit(__driver##_exit);
-
-	#define netdev_features_t			u32
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0)
-	#define PMSG_IS_AUTO(msg)	(((msg).event & PM_EVENT_AUTO) != 0)
-
-	static inline struct page *skb_frag_page(const skb_frag_t *frag)
-	{
-		return frag->page;
-	}
-
-	static inline void *skb_frag_address(const skb_frag_t *frag)
-	{
-		return page_address(skb_frag_page(frag)) + frag->page_offset;
-	}
-
-	static inline unsigned int skb_frag_size(const skb_frag_t *frag)
-	{
-		return frag->size;
-	}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0)
-	#define ndo_set_rx_mode				ndo_set_multicast_list
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)
-	#define NETIF_F_RXCSUM				(1 << 29) /* Receive checksumming offload */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
-	#define MDIO_AN_EEE_ADV				60	/* EEE advertisement */
-	#define MDIO_AN_EEE_ADV_100TX			0x0002	/* Advertise 100TX EEE cap */
-	#define MDIO_AN_EEE_ADV_1000T			0x0004	/* Advertise 1000T EEE cap */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
-	#define skb_checksum_none_assert(skb_ptr)	(skb_ptr)->ip_summed = CHECKSUM_NONE
-
-	static inline __be16 vlan_get_protocol(const struct sk_buff *skb)
-	{
-	       __be16 protocol = 0;
-
-	       if (vlan_tx_tag_present(skb) ||
-	            skb->protocol != cpu_to_be16(ETH_P_8021Q))
-	               protocol = skb->protocol;
-	       else {
-	               __be16 proto, *protop;
-	               protop = skb_header_pointer(skb, offsetof(struct vlan_ethhdr,
-	                                               h_vlan_encapsulated_proto),
-	                                               sizeof(proto), &proto);
-	               if (likely(protop))
-	                       protocol = *protop;
-	       }
-
-	       return protocol;
-	}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)
-	#define skb_tx_timestamp(skb)
-
-	#define queue_delayed_work(long_wq, work, delay)	schedule_delayed_work(work, delay)
-
-	static inline void usleep_range(unsigned long min, unsigned long max)
-	{
-		unsigned long ms = min / 1000;
-
-		if (ms)
-			mdelay(ms);
-
-		udelay(min % 1000);
-	}
-
-	#define work_busy(x)				0
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)
-	static inline bool pci_dev_run_wake(struct pci_dev *dev)
-	{
-		return 1;
-	}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34)
-	#define netdev_mc_count(netdev)			((netdev)->mc_count)
-	#define netdev_mc_empty(netdev)			(netdev_mc_count(netdev) == 0)
-
-	#define netif_printk(priv, type, level, netdev, fmt, args...)	\
-	do {								\
-		if (netif_msg_##type(priv))				\
-			printk(level "%s: " fmt,(netdev)->name , ##args); \
-	} while (0)
-
-	#define netif_emerg(priv, type, netdev, fmt, args...)		\
-		netif_printk(priv, type, KERN_EMERG, netdev, fmt, ##args)
-	#define netif_alert(priv, type, netdev, fmt, args...)		\
-		netif_printk(priv, type, KERN_ALERT, netdev, fmt, ##args)
-	#define netif_crit(priv, type, netdev, fmt, args...)		\
-		netif_printk(priv, type, KERN_CRIT, netdev, fmt, ##args)
-	#define netif_err(priv, type, netdev, fmt, args...)		\
-		netif_printk(priv, type, KERN_ERR, netdev, fmt, ##args)
-	#define netif_warn(priv, type, netdev, fmt, args...)		\
-		netif_printk(priv, type, KERN_WARNING, netdev, fmt, ##args)
-	#define netif_notice(priv, type, netdev, fmt, args...)		\
-		netif_printk(priv, type, KERN_NOTICE, netdev, fmt, ##args)
-	#define netif_info(priv, type, netdev, fmt, args...)		\
-		netif_printk(priv, type, KERN_INFO, (netdev), fmt, ##args)
-
-	static inline int usb_enable_autosuspend(struct usb_device *udev)
-	{ return 0; }
-	static inline int usb_disable_autosuspend(struct usb_device *udev)
-	{ return 0; }
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
-	#define get_sset_count				get_stats_count
-
-	static inline
-	struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev,
-						  unsigned int length)
-	{
-		struct sk_buff *skb = netdev_alloc_skb(dev, length + NET_IP_ALIGN);
-
-		if (NET_IP_ALIGN && skb)
-			skb_reserve(skb, NET_IP_ALIGN);
-		return skb;
-	}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32)
-	#define pm_request_resume(para)
-	#define pm_runtime_set_suspended(para)
-	#define pm_schedule_suspend(para1, para2)
-	#define pm_runtime_get_sync(para)
-	#define pm_runtime_put_sync(para)
-	#define pm_runtime_put_noidle(para)
-	#define pm_runtime_idle(para)
-	#define pm_runtime_set_active(para)
-	#define pm_runtime_enable(para)
-	#define pm_runtime_disable(para)
-	typedef int netdev_tx_t;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
-	#define USB_SPEED_SUPER				(USB_SPEED_VARIABLE + 1)
-	#define MDIO_MMD_AN				7	/* Auto-Negotiation */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
-	#define napi_gro_receive(napi, skb)		netif_receive_skb(skb)
-	#define vlan_gro_receive(napi, grp, vlan_tci, skb) \
-		vlan_hwaccel_receive_skb(skb, grp, vlan_tci)
-
-	static inline void usb_autopm_put_interface_async(struct usb_interface *intf)
-	{
-		struct usb_device *udev = interface_to_usbdev(intf);
-		int status = 0;
-
-		if (intf->condition == USB_INTERFACE_UNBOUND) {
-			status = -ENODEV;
-		} else {
-			udev->last_busy = jiffies;
-			--intf->pm_usage_cnt;
-			if (udev->autosuspend_disabled || udev->autosuspend_delay < 0)
-				status = -EPERM;
-		}
-	}
-
-	static inline int usb_autopm_get_interface_async(struct usb_interface *intf)
-	{
-		struct usb_device *udev = interface_to_usbdev(intf);
-		int status = 0;
-
-		if (intf->condition == USB_INTERFACE_UNBOUND)
-			status = -ENODEV;
-		else if (udev->autoresume_disabled)
-			status = -EPERM;
-		else
-			++intf->pm_usage_cnt;
-		return status;
-	}
-
-	static inline int eth_change_mtu(struct net_device *dev, int new_mtu)
-	{
-		if (new_mtu < 68 || new_mtu > ETH_DATA_LEN)
-			return -EINVAL;
-		dev->mtu = new_mtu;
-		return 0;
-	}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
-	static inline void __skb_queue_splice(const struct sk_buff_head *list,
-					      struct sk_buff *prev,
-					      struct sk_buff *next)
-	{
-		struct sk_buff *first = list->next;
-		struct sk_buff *last = list->prev;
-
-		first->prev = prev;
-		prev->next = first;
-
-		last->next = next;
-		next->prev = last;
-	}
-
-	static inline void skb_queue_splice(const struct sk_buff_head *list,
-					    struct sk_buff_head *head)
-	{
-		if (!skb_queue_empty(list)) {
-			__skb_queue_splice(list, (struct sk_buff *) head, head->next);
-			head->qlen += list->qlen;
-		}
-	}
-
-	static inline void __skb_queue_head_init(struct sk_buff_head *list)
-	{
-		list->prev = list->next = (struct sk_buff *)list;
-		list->qlen = 0;
-	}
-
-	static inline void skb_queue_splice_init(struct sk_buff_head *list,
-						 struct sk_buff_head *head)
-	{
-		if (!skb_queue_empty(list)) {
-			__skb_queue_splice(list, (struct sk_buff *) head, head->next);
-			head->qlen += list->qlen;
-			__skb_queue_head_init(list);
-		}
-	}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
-	#define PM_EVENT_AUTO		0x0400
-
-	static inline void __list_splice2(const struct list_head *list,
-					  struct list_head *prev,
-					  struct list_head *next)
-	{
-		struct list_head *first = list->next;
-		struct list_head *last = list->prev;
-
-		first->prev = prev;
-		prev->next = first;
-
-		last->next = next;
-		next->prev = last;
-	}
-
-	static inline void list_splice_tail(struct list_head *list,
-					    struct list_head *head)
-	{
-		if (!list_empty(list))
-			__list_splice2(list, head->prev, head);
-	}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
-	struct napi_struct {
-		struct list_head	poll_list;
-		unsigned long		state;
-		int			weight;
-		int			(*poll)(struct napi_struct *, int);
-	#ifdef CONFIG_NETPOLL
-		spinlock_t		poll_lock;
-		int			poll_owner;
-		struct net_device	*dev;
-		struct list_head	dev_list;
-	#endif
-	};
-
-	#define napi_enable(napi_ptr)			netif_poll_enable(container_of(napi_ptr, struct r8152, napi)->netdev)
-	#define napi_disable(napi_ptr)			netif_poll_disable(container_of(napi_ptr, struct r8152, napi)->netdev)
-	#define napi_schedule(napi_ptr)			netif_rx_schedule(container_of(napi_ptr, struct r8152, napi)->netdev)
-	#define napi_complete(napi_ptr)			netif_rx_complete(container_of(napi_ptr, struct r8152, napi)->netdev)
-	#define netif_napi_add(ndev, napi_ptr, function, weight_t) \
-		ndev->poll = function; \
-		ndev->weight = weight_t;
-	typedef unsigned long				uintptr_t;
-	#define DMA_BIT_MASK(value) \
-		(value < 64 ? ((1ULL << value) - 1) : 0xFFFFFFFFFFFFFFFFULL)
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
-	#define NETIF_F_IPV6_CSUM			16
-	#define cancel_delayed_work_sync		cancel_delayed_work
-
-	static inline int skb_cow_head(struct sk_buff *skb, unsigned int headroom)
-	{
-		int delta = 0;
-
-		if (headroom > skb_headroom(skb))
-			delta = headroom - skb_headroom(skb);
-
-		if (delta || skb_header_cloned(skb))
-			return pskb_expand_head(skb, ALIGN(delta, NET_SKB_PAD),
-						0, GFP_ATOMIC);
-		return 0;
-	}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
-	#define ip_hdr(skb_ptr)				(skb_ptr)->nh.iph
-	#define ipv6hdr(skb_ptr)			(skb_ptr)->nh.ipv6h
-
-	static inline void skb_copy_from_linear_data(const struct sk_buff *skb,
-						     void *to,
-						     const unsigned int len)
-	{
-		memcpy(to, skb->data, len);
-	}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)
-	#define vlan_group_set_device(vlgrp, vid, value) \
-		if (vlgrp) \
-			(vlgrp)->vlan_devices[vid] = value;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-	#define delayed_work				work_struct
-	#define INIT_DELAYED_WORK(a,b)			INIT_WORK(a,b,tp)
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-	#define CHECKSUM_PARTIAL			CHECKSUM_HW
-
-	static inline void *kmemdup(const void *src, size_t len, gfp_t gfp)
-	{
-		void *p;
-
-		p = kmalloc_track_caller(len, gfp);
-		if (p)
-			memcpy(p, src, len);
-		return p;
-	}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
-	#define skb_is_gso(skb_ptr)			skb_shinfo(skb_ptr)->tso_size
-	#define netdev_alloc_skb(dev, len)		dev_alloc_skb(len)
-	#define IRQF_SHARED				SA_SHIRQ
-
-	static inline struct sk_buff *skb_gso_segment(struct sk_buff *skb, int features)
-	{
-		return NULL;
-	}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
-	#ifndef __LINUX_MUTEX_H
-	#define mutex					semaphore
-	#define mutex_lock				down
-	#define mutex_unlock				up
-	#define mutex_trylock				down_trylock
-	#define mutex_lock_interruptible		down_interruptible
-	#define mutex_init				init_MUTEX
-	#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
-	#define ADVERTISED_Pause			(1 << 13)
-	#define ADVERTISED_Asym_Pause			(1 << 14)
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
-	#define skb_header_cloned(skb)			skb_cloned(skb)
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) */
-	static inline void netif_napi_del(struct napi_struct *napi)
-	{
-	#ifdef CONFIG_NETPOLL
-	        list_del(&napi->dev_list);
-	#endif
-	}
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4,1,0) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4,5,0) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4,9,0) */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4,12,0) */
-
-#ifndef FALSE
-	#define TRUE	1
-	#define FALSE	0
-#endif
-
-enum rtl_cmd {
-	RTLTOOL_PLA_OCP_READ_DWORD = 0,
-	RTLTOOL_PLA_OCP_WRITE_DWORD,
-	RTLTOOL_USB_OCP_READ_DWORD,
-	RTLTOOL_USB_OCP_WRITE_DWORD,
-	RTLTOOL_PLA_OCP_READ,
-	RTLTOOL_PLA_OCP_WRITE,
-	RTLTOOL_USB_OCP_READ,
-	RTLTOOL_USB_OCP_WRITE,
-	RTLTOOL_USB_INFO,
-	RTL_ENABLE_USB_DIAG,
-	RTL_DISABLE_USB_DIAG,
-
-	RTLTOOL_INVALID
-};
-
-struct usb_device_info {
-	__u16		idVendor;
-	__u16		idProduct;
-	__u16		bcdDevice;
-	__u8		dev_addr[8];
-	char		devpath[16];
-};
-
-struct rtltool_cmd {
-	__u32	cmd;
-	__u32	offset;
-	__u32	byteen;
-	__u32	data;
-	void	*buf;
-	struct usb_device_info nic_info;
-	struct sockaddr ifru_addr;
-	struct sockaddr ifru_netmask;
-	struct sockaddr ifru_hwaddr;
-};
-
-#endif /* LINUX_COMPATIBILITY_H */
--- a/package/lean/r8152/src/r8152.c
+++ b/package/lean/r8152/src/r8152.c
--- a/package/lienol/trojan/Makefile
+++ b/package/lienol/trojan/Makefile
@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=trojan
-PKG_VERSION:=1.14.1
-PKG_RELEASE:=3
+PKG_VERSION:=1.15.0
+PKG_RELEASE:=1

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/trojan-gfw/trojan.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=5074793bef10c3ce4546b2995dbbdde83cdba3dc
+PKG_SOURCE_VERSION:=26637b32213fbd508c85d7f8fbfcf593f8330ae3
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz

 CMAKE_INSTALL:=1
@ -65,4 +65,5 @@ define Package/trojan/install
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/trojan $(1)/usr/sbin/trojan
 endef

-$(eval $(call BuildPackage,trojan))
+$(eval $(call BuildPackage,trojan))
+
--- a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/gsw_mt7621.c
+++ b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/gsw_mt7621.c
@ -186,6 +186,22 @@ static void mt7621_hw_init(struct mt7620_gsw *gsw, struct device_node *np)
 	mt7530_mdio_w32(gsw, 0x7a74, 0x44);
 	mt7530_mdio_w32(gsw, 0x7a7c, 0x44);

+	/* Disable EEE */
+	for (i = 0; i <= 4; i++) {
+		_mt7620_mii_write(gsw, i, 13, 0x7);
+		_mt7620_mii_write(gsw, i, 14, 0x3C);
+		_mt7620_mii_write(gsw, i, 13, 0x4007);
+		_mt7620_mii_write(gsw, i, 14, 0x0);
+	}
+
+	/* Disable EEE 10Base-Te */
+	for (i = 0; i <= 4; i++) {
+		_mt7620_mii_write(gsw, i, 13, 0x1f);
+		_mt7620_mii_write(gsw, i, 14, 0x027b);
+		_mt7620_mii_write(gsw, i, 13, 0x401f);
+		_mt7620_mii_write(gsw, i, 14, 0x1177);
+	}
+
 	/* turn on all PHYs */
 	for (i = 0; i <= 4; i++) {
 		val = _mt7620_mii_read(gsw, i, 0);
--- a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@ -565,7 +565,7 @@ static inline u32 fe_empty_txd(struct fe_tx_ring *ring)
 	barrier();
 	return (u32)(ring->tx_ring_size -
 			((ring->tx_next_idx - ring->tx_free_idx) &
-			 (ring->tx_ring_size - 1)));
+			 (ring->tx_ring_size - 1)) - 1);
 }

 struct fe_map_state {