fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Mainline

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2022-03-14 15:27:23 +08:00
commit 523163b6b7
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
4 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package/base-files/files/etc/banner
View File

@ -1,8 +1,10 @@
_______ ________ __
| |.-----.-----.-----.| | | |.----.| |_
| - || _ | -__| || | | || _|| _|
|_______|| __|_____|__|__||________||__| |____|
|__| W I R E L E S S F R E E D O M
.___ __ .__
| | _____ _____ ____________/ |______ | |
| |/ \ / \ / _ \_ __ \ __\__ \ | |
| | Y Y \ Y Y ( <_> ) | \/| | / __ \| |__
|___|__|_| /__|_| /\____/|__| |__| (____ /____/
\/ \/ \/
BE FREE AND UNAFRAID
-----------------------------------------------------
%D %V, %C
-----------------------------------------------------

25
package/kernel/linux/modules/netsupport.mk
View File

@ -1261,6 +1261,31 @@ endef
$(eval $(call KernelPackage,netlink-diag))
define KernelPackage/inet-diag
SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=INET diag support for ss utility
KCONFIG:= \
CONFIG_INET_DIAG \
CONFIG_INET_TCP_DIAG \
CONFIG_INET_UDP_DIAG \
CONFIG_INET_RAW_DIAG \
CONFIG_INET_DIAG_DESTROY=n
FILES:= \
$(LINUX_DIR)/net/ipv4/inet_diag.ko \
$(LINUX_DIR)/net/ipv4/tcp_diag.ko \
$(LINUX_DIR)/net/ipv4/udp_diag.ko \
$(LINUX_DIR)/net/ipv4/raw_diag.ko
AUTOLOAD:=$(call AutoLoad,31,inet_diag tcp_diag udp_diag raw_diag)
endef
define KernelPackage/inet-diag/description
Support for INET (TCP, DCCP, etc) socket monitoring interface used by
native Linux tools such as ss.
endef
$(eval $(call KernelPackage,inet-diag))
define KernelPackage/wireguard
SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=WireGuard secure network tunnel

1
package/kernel/r8125/Makefile
View File

@ -18,6 +18,7 @@ define KernelPackage/r8125
TITLE:=Driver for Realtek r8125 chipsets
SUBMENU:=Network Devices
VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
DEPENDS:=@PCI_SUPPORT
FILES:= $(PKG_BUILD_DIR)/r8125.ko
AUTOLOAD:=$(call AutoProbe,r8125)
endef

2
package/kernel/r8168/Makefile
View File

@ -26,7 +26,7 @@ define KernelPackage/r8168
TITLE:=Driver for Realtek r8168 chipsets
SUBMENU:=Network Devices
VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
DEPENDS:=@LINUX_5_4
DEPENDS:=@PCI_SUPPORT @LINUX_5_4
FILES:= $(PKG_BUILD_DIR)/src/r8168.ko
AUTOLOAD:=$(call AutoProbe,r8168)
CONFLICTS:=kmod-r8169