diff mbox series

[OpenWrt-Devel,2/3] netsupport: improve xfrm module support

Message ID 20190614110947.10540-3-avalentin@marcant.net
State Accepted
Headers show
Series xfrm: fix xfrm interface deletion and improve module loading | expand

Commit Message

André Valentin June 14, 2019, 11:09 a.m. UTC
-switch to module autoprobe
-exclude 4.9 kernel

Signed-off-by: André Valentin <avalentin@marcant.net>
---
 package/kernel/linux/modules/netsupport.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Hans Dedecker June 15, 2019, 7:35 p.m. UTC | #1
Hi,

On Fri, Jun 14, 2019 at 1:10 PM André Valentin <avalentin@marcant.net> wrote:
>
> -switch to module autoprobe
> -exclude 4.9 kernel
>
> Signed-off-by: André Valentin <avalentin@marcant.net>
> ---
>  package/kernel/linux/modules/netsupport.mk | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
> index 20616d9af6..9732ee0d73 100644
> --- a/package/kernel/linux/modules/netsupport.mk
> +++ b/package/kernel/linux/modules/netsupport.mk
> @@ -386,10 +386,10 @@ $(eval $(call KernelPackage,ip6-vti))
>  define KernelPackage/xfrm-interface
>    SUBMENU:=$(NETWORK_SUPPORT_MENU)
>    TITLE:=IPsec XFRM Interface
> -  DEPENDS:=+kmod-ipsec4 +kmod-ipsec6 @!LINUX_4_14
> +  DEPENDS:=+kmod-ipsec4 +kmod-ipsec6 @!LINUX_4_14 @!LINUX_4_9
Is there a reason why you want to exclude kernel version 4.9 as in
master all targets will be switched to 4.19 and afaik no targets will
use 4.9

Hans
>    KCONFIG:=CONFIG_XFRM_INTERFACE
>    FILES:=$(LINUX_DIR)/net/xfrm/xfrm_interface.ko
> -  AUTOLOAD:=$(call AutoLoad,33,xfrm_interface)
> +  AUTOLOAD:=$(call AutoProbe,xfrm_interface)
>  endef
>
>  define KernelPackage/xfrm-interface/description
> --
> 2.11.0
>
>
> _______________________________________________
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel
André Valentin June 15, 2019, 11:50 p.m. UTC | #2
Hi!
Am 15.06.19 um 21:35 schrieb Hans Dedecker:
> Hi,
> 
> On Fri, Jun 14, 2019 at 1:10 PM André Valentin <avalentin@marcant.net> wrote:
>>
>> -switch to module autoprobe
>> -exclude 4.9 kernel
>>
>> Signed-off-by: André Valentin <avalentin@marcant.net>
>> ---
>>  package/kernel/linux/modules/netsupport.mk | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
>> index 20616d9af6..9732ee0d73 100644
>> --- a/package/kernel/linux/modules/netsupport.mk
>> +++ b/package/kernel/linux/modules/netsupport.mk
>> @@ -386,10 +386,10 @@ $(eval $(call KernelPackage,ip6-vti))
>>  define KernelPackage/xfrm-interface
>>    SUBMENU:=$(NETWORK_SUPPORT_MENU)
>>    TITLE:=IPsec XFRM Interface
>> -  DEPENDS:=+kmod-ipsec4 +kmod-ipsec6 @!LINUX_4_14
>> +  DEPENDS:=+kmod-ipsec4 +kmod-ipsec6 @!LINUX_4_14 @!LINUX_4_9
> Is there a reason why you want to exclude kernel version 4.9 as in
> master all targets will be switched to 4.19 and afaik no targets will
> use 4.9


It was Hauke Mehrtens wish, so I'm a bit in between.

Kind regards,

André
Hans Dedecker June 16, 2019, 7:35 a.m. UTC | #3
On Sun, Jun 16, 2019 at 1:50 AM Andre Valentin <avalentin@marcant.net> wrote:
>
> Hi!
> Am 15.06.19 um 21:35 schrieb Hans Dedecker:
> > Hi,
> >
> > On Fri, Jun 14, 2019 at 1:10 PM André Valentin <avalentin@marcant.net> wrote:
> >>
> >> -switch to module autoprobe
> >> -exclude 4.9 kernel
> >>
> >> Signed-off-by: André Valentin <avalentin@marcant.net>
> >> ---
> >>  package/kernel/linux/modules/netsupport.mk | 4 ++--
> >>  1 file changed, 2 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
> >> index 20616d9af6..9732ee0d73 100644
> >> --- a/package/kernel/linux/modules/netsupport.mk
> >> +++ b/package/kernel/linux/modules/netsupport.mk
> >> @@ -386,10 +386,10 @@ $(eval $(call KernelPackage,ip6-vti))
> >>  define KernelPackage/xfrm-interface
> >>    SUBMENU:=$(NETWORK_SUPPORT_MENU)
> >>    TITLE:=IPsec XFRM Interface
> >> -  DEPENDS:=+kmod-ipsec4 +kmod-ipsec6 @!LINUX_4_14
> >> +  DEPENDS:=+kmod-ipsec4 +kmod-ipsec6 @!LINUX_4_14 @!LINUX_4_9
> > Is there a reason why you want to exclude kernel version 4.9 as in
> > master all targets will be switched to 4.19 and afaik no targets will
> > use 4.9
>
>
> It was Hauke Mehrtens wish, so I'm a bit in between.
Fine; I will check with Hauke

Hans
>
> Kind regards,
>
> André
>
diff mbox series

Patch

diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
index 20616d9af6..9732ee0d73 100644
--- a/package/kernel/linux/modules/netsupport.mk
+++ b/package/kernel/linux/modules/netsupport.mk
@@ -386,10 +386,10 @@  $(eval $(call KernelPackage,ip6-vti))
 define KernelPackage/xfrm-interface
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IPsec XFRM Interface
-  DEPENDS:=+kmod-ipsec4 +kmod-ipsec6 @!LINUX_4_14
+  DEPENDS:=+kmod-ipsec4 +kmod-ipsec6 @!LINUX_4_14 @!LINUX_4_9
   KCONFIG:=CONFIG_XFRM_INTERFACE
   FILES:=$(LINUX_DIR)/net/xfrm/xfrm_interface.ko
-  AUTOLOAD:=$(call AutoLoad,33,xfrm_interface)
+  AUTOLOAD:=$(call AutoProbe,xfrm_interface)
 endef
 
 define KernelPackage/xfrm-interface/description