[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede:
  if wan iface set to apcli0 or apclii0 while wireless relay, add them to lan should be avoided (coolsnowwolf#5528)
  v2ray 4.28.2 (coolsnowwolf#5508)
  Update Makefile (coolsnowwolf#5510)
  update n2n 2.8 to latest commit (coolsnowwolf#5518)

package/lean/frp/Makefile

@@ -13,7 +13,7 @@ PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/fatedier/frp/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=3C4F354C7C82EB5001F0DE5A55015ACBAA1FBA03AA97647A74131BC4118598A8
+PKG_HASH:=3c4f354c7c82eb5001f0de5a55015acbaa1fba03aa97647a74131bc4118598a8
 
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE

package/lean/mt/drivers/mt_wifi/files/mt7615.lua

@@ -25,6 +25,10 @@ end
 
 function add_vif_into_lan(vif)
     local mtkwifi = require("mtkwifi")
+    local wanif = mtkwifi.__trim(mtkwifi.read_pipe("uci get network.wan.ifname"))
+    if (string.match(vif, wanif)) then
+        return
+    end
     local brvifs = mtkwifi.__trim(
         mtkwifi.read_pipe("uci get network.lan.ifname"))
     if not string.match(brvifs, esc(vif)) then
@@ -98,6 +102,7 @@ function mt7615_up(devname)
     end
 
     os.execute(" rm -rf /tmp/mtk/wifi/mt7615*.need_reload")
+    os.execute("/etc/init.d/network restart")
 end
 
 function mt7615_down(devname)

package/lean/n2n_v2/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=n2n
 PKG_SOURCE_URL:=https://github.com/ntop/n2n.git
-PKG_SOURCE_VERSION:=3c983286184ebf2e06db6ccfb3223ea9430c216b
+PKG_SOURCE_VERSION:=99e56e9f3c34c49eeb297971d41150b433489120
 PKG_VERSION:=2.8.0_git-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 

package/lean/v2ray/Makefile

@@ -9,13 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=v2ray
-PKG_VERSION:=4.27.5
+PKG_VERSION:=4.28.2
 PKG_RELEASE:=1
 PKG_BUILD_DIR:=$(BUILD_DIR)/v2ray-core-$(PKG_VERSION)
 
 PKG_SOURCE:=v2ray-core-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/v2fly/v2ray-core/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=f289d8d85ab0851851a6e3c101226e77bed0052fd60f9185df8852b601e657f8
+PKG_HASH:=e5d6603454622e1f466c4c20061992046124fc7c
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE