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

Merge Official Source

Browse Source
This commit is contained in:
CN_SZTL 2020-04-08 03:22:08 +08:00
commit 6e411cfd3b
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1243,3 +1243,18 @@ define KernelPackage/macsec/description
endef
$(eval $(call KernelPackage,macsec))
define KernelPackage/netlink-diag
SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=Netlink diag support for ss utility
KCONFIG:=CONFIG_NETLINK_DIAG
FILES:=$(LINUX_DIR)/net/netlink/netlink_diag.ko
AUTOLOAD:=$(call AutoLoad,31,netlink-diag)
endef
define KernelPackage/netlink-diag/description
Netlink diag is a module made for use with iproute2's ss utility
endef
$(eval $(call KernelPackage,netlink-diag))

4
package/network/utils/iproute2/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=iproute2
PKG_VERSION:=5.5.0
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2
@ -73,7 +73,7 @@ endef
define Package/ss
$(call Package/iproute2/Default)
TITLE:=Socket statistics utility
DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl +(PACKAGE_tc||PACKAGE_ip-full):libelf
DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl +(PACKAGE_tc||PACKAGE_ip-full):libelf +kmod-netlink-diag
endef
define Package/nstat