OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire fileIgnore whitespace
Rev 2 Rev 3
Line 455... Line 455...
455 endef 455 endef
Line 456... Line 456...
456   456  
Line 457... Line -...
457 $(eval $(call KernelPackage,fou)) -  
458   -  
459   -  
460 define KernelPackage/fou6 -  
461 SUBMENU:=$(NETWORK_SUPPORT_MENU) -  
462 TITLE:=FOU and GUE decapsulation over IPv6 -  
463 DEPENDS:= @IPV6 \ -  
464 +kmod-fou \ -  
465 +kmod-ip6-tunnel -  
466 KCONFIG:= \ -  
467 CONFIG_IPV6_FOU \ -  
468 CONFIG_IPV6_FOU_TUNNEL -  
469 FILES:=$(LINUX_DIR)/net/ipv6/fou6.ko -  
470 AUTOLOAD:=$(call AutoProbe,fou6) -  
471 endef -  
472   -  
473 define KernelPackage/fou6/description -  
474 Kernel module for FOU (Foo over UDP) and GUE (Generic UDP Encapsulation) tunnelling over IPv6. -  
475 Requires Kernel 3.18 or newer. -  
476 endef -  
477   -  
478 $(eval $(call KernelPackage,fou6)) 457 $(eval $(call KernelPackage,fou))
479   458  
480   459  
481 define KernelPackage/ip6-tunnel 460 define KernelPackage/ip6-tunnel
482 SUBMENU:=$(NETWORK_SUPPORT_MENU) 461 SUBMENU:=$(NETWORK_SUPPORT_MENU)
Line 714... Line 693...
714   693  
Line 715... Line 694...
715 $(eval $(call KernelPackage,mppe)) 694 $(eval $(call KernelPackage,mppe))
716   695  
717   696  
718 SCHED_MODULES = $(patsubst $(LINUX_DIR)/net/sched/%.ko,%,$(wildcard $(LINUX_DIR)/net/sched/*.ko)) 697 SCHED_MODULES = $(patsubst $(LINUX_DIR)/net/sched/%.ko,%,$(wildcard $(LINUX_DIR)/net/sched/*.ko))
719 SCHED_MODULES_CORE = sch_ingress sch_fq_codel sch_hfsc sch_htb sch_tbf cls_basic cls_fw cls_route cls_flow cls_tcindex cls_u32 em_u32 act_mirred act_skbedit cls_matchall 698 SCHED_MODULES_CORE = sch_ingress sch_fq_codel sch_hfsc sch_htb sch_tbf cls_fw cls_route cls_flow cls_tcindex cls_u32 em_u32 act_mirred act_skbedit
720 SCHED_MODULES_FILTER = $(SCHED_MODULES_CORE) act_connmark sch_netem em_ipset cls_bpf act_bpf 699 SCHED_MODULES_FILTER = $(SCHED_MODULES_CORE) act_connmark sch_netem
Line 721... Line 700...
721 SCHED_MODULES_EXTRA = $(filter-out $(SCHED_MODULES_FILTER),$(SCHED_MODULES)) 700 SCHED_MODULES_EXTRA = $(filter-out $(SCHED_MODULES_FILTER),$(SCHED_MODULES))
722 SCHED_FILES = $(patsubst %,$(LINUX_DIR)/net/sched/%.ko,$(filter $(SCHED_MODULES_CORE),$(SCHED_MODULES))) 701 SCHED_FILES = $(patsubst %,$(LINUX_DIR)/net/sched/%.ko,$(filter $(SCHED_MODULES_CORE),$(SCHED_MODULES)))
723 SCHED_FILES_EXTRA = $(patsubst %,$(LINUX_DIR)/net/sched/%.ko,$(SCHED_MODULES_EXTRA)) 702 SCHED_FILES_EXTRA = $(patsubst %,$(LINUX_DIR)/net/sched/%.ko,$(SCHED_MODULES_EXTRA))
724   -  
725 define KernelPackage/sched-core 703  
726 SUBMENU:=$(NETWORK_SUPPORT_MENU) 704 define KernelPackage/sched-core
727 TITLE:=Traffic schedulers 705 SUBMENU:=$(NETWORK_SUPPORT_MENU)
728 DEPENDS:=@!LINUX_3_18 706 TITLE:=Traffic schedulers
729 KCONFIG:= \ 707 KCONFIG:= \
730 CONFIG_NET_SCHED=y \ 708 CONFIG_NET_SCHED=y \
731 CONFIG_NET_SCH_HFSC \ 709 CONFIG_NET_SCH_HFSC \
732 CONFIG_NET_SCH_HTB \ 710 CONFIG_NET_SCH_HTB \
733 CONFIG_NET_SCH_TBF \ 711 CONFIG_NET_SCH_TBF \
734 CONFIG_NET_SCH_INGRESS \ -  
735 CONFIG_NET_SCH_FQ_CODEL \ 712 CONFIG_NET_SCH_INGRESS \
736 CONFIG_NET_CLS=y \ 713 CONFIG_NET_SCH_FQ_CODEL \
737 CONFIG_NET_CLS_ACT=y \ 714 CONFIG_NET_CLS=y \
738 CONFIG_NET_CLS_BASIC \ 715 CONFIG_NET_CLS_ACT=y \
739 CONFIG_NET_CLS_FLOW \ 716 CONFIG_NET_CLS_FLOW \
740 CONFIG_NET_CLS_FW \ 717 CONFIG_NET_CLS_FW \
741 CONFIG_NET_CLS_ROUTE4 \ 718 CONFIG_NET_CLS_ROUTE4 \
742 CONFIG_NET_CLS_TCINDEX \ -  
743 CONFIG_NET_CLS_U32 \ 719 CONFIG_NET_CLS_TCINDEX \
744 CONFIG_NET_ACT_MIRRED \ 720 CONFIG_NET_CLS_U32 \
745 CONFIG_NET_ACT_SKBEDIT \ 721 CONFIG_NET_ACT_MIRRED \
746 CONFIG_NET_CLS_MATCHALL \ 722 CONFIG_NET_ACT_SKBEDIT \
747 CONFIG_NET_EMATCH=y \ 723 CONFIG_NET_EMATCH=y \
Line 765... Line 741...
765 FILES:=$(LINUX_DIR)/net/sched/act_connmark.ko 741 FILES:=$(LINUX_DIR)/net/sched/act_connmark.ko
766 AUTOLOAD:=$(call AutoLoad,71, act_connmark) 742 AUTOLOAD:=$(call AutoLoad,71, act_connmark)
767 endef 743 endef
768 $(eval $(call KernelPackage,sched-connmark)) 744 $(eval $(call KernelPackage,sched-connmark))
Line 769... Line -...
769   -  
770   -  
771 define KernelPackage/sched-ipset -  
772 SUBMENU:=$(NETWORK_SUPPORT_MENU) -  
773 TITLE:=Traffic shaper ipset support -  
774 DEPENDS:=+kmod-sched-core +kmod-ipt-ipset -  
775 KCONFIG:= \ -  
776 CONFIG_NET_EMATCH_IPSET -  
777 FILES:= \ -  
778 $(LINUX_DIR)/net/sched/em_ipset.ko -  
779 AUTOLOAD:=$(call AutoLoad,72,em_ipset) -  
780 endef -  
781   -  
782 $(eval $(call KernelPackage,sched-ipset)) -  
783   -  
784   -  
785 define KernelPackage/sched-bpf -  
786 SUBMENU:=$(NETWORK_SUPPORT_MENU) -  
787 TITLE:=Traffic shaper support for Berkeley Packet Filter -  
788 DEPENDS:=@!LINUX_3_18 -  
789 KCONFIG:= \ -  
790 CONFIG_NET_CLS_BPF \ -  
791 CONFIG_NET_ACT_BPF -  
792 FILES:= \ -  
793 $(LINUX_DIR)/net/sched/cls_bpf.ko \ -  
794 $(LINUX_DIR)/net/sched/act_bpf.ko -  
795 AUTOLOAD:=$(call AutoLoad,72,cls_bpf act_bpf) -  
796 endef -  
797   -  
798 $(eval $(call KernelPackage,sched-bpf)) -  
799   -  
800   -  
801 define KernelPackage/bpf-test -  
802 SUBMENU:=$(NETWORK_SUPPORT_MENU) -  
803 TITLE:=Test Berkeley Packet Filter functionality -  
804 DEPENDS:=@!LINUX_3_18 -  
805 KCONFIG:=CONFIG_TEST_BPF -  
806 FILES:=$(LINUX_DIR)/lib/test_bpf.ko -  
807 endef -  
808   -  
809 $(eval $(call KernelPackage,bpf-test)) -  
810   -  
811   745  
812 define KernelPackage/sched 746 define KernelPackage/sched
813 SUBMENU:=$(NETWORK_SUPPORT_MENU) 747 SUBMENU:=$(NETWORK_SUPPORT_MENU)
814 TITLE:=Extra traffic schedulers 748 TITLE:=Extra traffic schedulers
815 DEPENDS:=+kmod-sched-core +kmod-ipt-core +kmod-lib-crc32c 749 DEPENDS:=+kmod-sched-core +kmod-ipt-core
816 KCONFIG:= \ 750 KCONFIG:= \
817 CONFIG_NET_SCH_CODEL \ 751 CONFIG_NET_SCH_CODEL \
818 CONFIG_NET_SCH_DSMARK \ 752 CONFIG_NET_SCH_DSMARK \
819 CONFIG_NET_SCH_FIFO \ 753 CONFIG_NET_SCH_FIFO \
Line 823... Line 757...
823 CONFIG_NET_SCH_RED \ 757 CONFIG_NET_SCH_RED \
824 CONFIG_NET_SCH_SFQ \ 758 CONFIG_NET_SCH_SFQ \
825 CONFIG_NET_SCH_TEQL \ 759 CONFIG_NET_SCH_TEQL \
826 CONFIG_NET_SCH_FQ \ 760 CONFIG_NET_SCH_FQ \
827 CONFIG_NET_SCH_PIE \ 761 CONFIG_NET_SCH_PIE \
-   762 CONFIG_NET_CLS_BASIC \
828 CONFIG_NET_ACT_POLICE \ 763 CONFIG_NET_ACT_POLICE \
829 CONFIG_NET_ACT_GACT \ -  
830 CONFIG_NET_ACT_IPT \ 764 CONFIG_NET_ACT_IPT \
831 CONFIG_NET_ACT_PEDIT \ -  
832 CONFIG_NET_ACT_SIMP \ -  
833 CONFIG_NET_ACT_CSUM \ -  
834 CONFIG_NET_EMATCH_CMP \ 765 CONFIG_NET_EMATCH_CMP \
835 CONFIG_NET_EMATCH_NBYTE \ 766 CONFIG_NET_EMATCH_NBYTE \
836 CONFIG_NET_EMATCH_META \ 767 CONFIG_NET_EMATCH_META \
837 CONFIG_NET_EMATCH_TEXT 768 CONFIG_NET_EMATCH_TEXT
838 FILES:=$(SCHED_FILES_EXTRA) 769 FILES:=$(SCHED_FILES_EXTRA)
Line 844... Line 775...
844 endef 775 endef
Line 845... Line 776...
845   776  
Line 846... Line -...
846 $(eval $(call KernelPackage,sched)) -  
847   -  
848   -  
849 define KernelPackage/tcp-bbr -  
850 SUBMENU:=$(NETWORK_SUPPORT_MENU) -  
851 TITLE:=BBR TCP congestion control -  
852 DEPENDS:=@!LINUX_3_18 +LINUX_4_9:kmod-sched -  
853 KCONFIG:= \ -  
854 CONFIG_TCP_CONG_ADVANCED=y \ -  
855 CONFIG_TCP_CONG_BBR -  
856 FILES:=$(LINUX_DIR)/net/ipv4/tcp_bbr.ko -  
857 AUTOLOAD:=$(call AutoLoad,74,tcp_bbr) -  
858 endef -  
859   -  
860 define KernelPackage/tcp-bbr/description -  
861 Kernel module for BBR (Bottleneck Bandwidth and RTT) TCP congestion -  
862 control. It requires the fq ("Fair Queue") pacing packet scheduler. -  
863 For kernel 4.13+, TCP internal pacing is implemented as fallback. -  
864 endef -  
865   -  
866 ifdef CONFIG_LINUX_4_9 -  
867 TCP_BBR_SYSCTL_CONF:=sysctl-tcp-bbr-k4_9.conf -  
868 else -  
869 TCP_BBR_SYSCTL_CONF:=sysctl-tcp-bbr.conf -  
870 endif -  
871   -  
872 define KernelPackage/tcp-bbr/install -  
873 $(INSTALL_DIR) $(1)/etc/sysctl.d -  
874 $(INSTALL_DATA) ./files/$(TCP_BBR_SYSCTL_CONF) $(1)/etc/sysctl.d/12-tcp-bbr.conf -  
875 endef -  
876   -  
877 $(eval $(call KernelPackage,tcp-bbr)) 777 $(eval $(call KernelPackage,sched))
878   778  
879   779  
880 define KernelPackage/ax25 780 define KernelPackage/ax25
881 SUBMENU:=$(NETWORK_SUPPORT_MENU) 781 SUBMENU:=$(NETWORK_SUPPORT_MENU)
Line 1063... Line 963...
1063 $(eval $(call KernelPackage,rxrpc)) 963 $(eval $(call KernelPackage,rxrpc))
Line 1064... Line 964...
1064   964  
1065 define KernelPackage/mpls 965 define KernelPackage/mpls
1066 SUBMENU:=$(NETWORK_SUPPORT_MENU) 966 SUBMENU:=$(NETWORK_SUPPORT_MENU)
1067 TITLE:=MPLS support 967 TITLE:=MPLS support
1068 DEPENDS:=@!LINUX_3_18 +LINUX_4_19:kmod-iptunnel 968 DEPENDS:=@!(LINUX_3_18||LINUX_4_1)
1069 KCONFIG:= \ 969 KCONFIG:= \
1070 CONFIG_MPLS=y \ 970 CONFIG_MPLS=y \
1071 CONFIG_LWTUNNEL=y \ 971 CONFIG_LWTUNNEL=y \
1072 CONFIG_LWTUNNEL_BPF=n \ 972 CONFIG_LWTUNNEL_BPF=n \
Line 1140... Line 1040...
1140 $(eval $(call KernelPackage,mdio)) 1040 $(eval $(call KernelPackage,mdio))
Line 1141... Line 1041...
1141   1041  
1142 define KernelPackage/macsec 1042 define KernelPackage/macsec
1143 SUBMENU:=$(NETWORK_SUPPORT_MENU) 1043 SUBMENU:=$(NETWORK_SUPPORT_MENU)
1144 TITLE:=IEEE 802.1AE MAC-level encryption (MAC) 1044 TITLE:=IEEE 802.1AE MAC-level encryption (MAC)
1145 DEPENDS:=+kmod-crypto-gcm @!LINUX_3_18 1045 DEPENDS:=+kmod-crypto-gcm @!LINUX_3_18 @!LINUX_4_1 @!LINUX_4_4
1146 KCONFIG:=CONFIG_MACSEC 1046 KCONFIG:=CONFIG_MACSEC
1147 FILES:=$(LINUX_DIR)/drivers/net/macsec.ko 1047 FILES:=$(LINUX_DIR)/drivers/net/macsec.ko
1148 AUTOLOAD:=$(call AutoLoad,13,macsec) 1048 AUTOLOAD:=$(call AutoLoad,13,macsec)