diff --git a/package/kernel/nat46/Makefile b/package/kernel/nat46/Makefile index dd1d55b84e..bcd0cbd9f6 100644 --- a/package/kernel/nat46/Makefile +++ b/package/kernel/nat46/Makefile @@ -3,11 +3,11 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=nat46 -PKG_MIRROR_HASH:=09b93f31d10030d3b4f326066b544b70b1f60236d0482f27c384ed93b298c0a6 PKG_SOURCE_URL:=https://github.com/ayourtch/nat46.git -PKG_SOURCE_DATE:=2022-09-19 +PKG_SOURCE_DATE:=2024-08-12 PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=4c5beee236841724219598fabb1edc93d4f08ce5 +PKG_SOURCE_VERSION:=b42c37d5c6dee4593df0fc60b37bc7ec4ee243a4 +PKG_MIRROR_HASH:=2d7bbb6cc22808f7e81d716e6bd7a27d9978fb802496304851946627e21534a5 PKG_MAINTAINER:=Hans Dedecker PKG_LICENSE:=GPL-2.0 diff --git a/package/kernel/nat46/patches/102-mapt.patch b/package/kernel/nat46/patches/102-mapt.patch index 1e83481c96..072d0cc447 100644 --- a/package/kernel/nat46/patches/102-mapt.patch +++ b/package/kernel/nat46/patches/102-mapt.patch @@ -161,7 +161,7 @@ Signed-off-by: Pavithra R void *netdev_nat46_instance(struct net_device *dev) { nat46_netdev_priv_t *priv = netdev_priv(dev); return priv->nat46; -@@ -159,6 +173,11 @@ int nat46_netdev_create(char *basename, +@@ -160,6 +174,11 @@ int nat46_netdev_create(struct net *net, printk("nat46: netdevice nat46 '%s' created successfully.\n", devname); kfree(devname); @@ -173,7 +173,7 @@ Signed-off-by: Pavithra R return 0; err_register_dev: -@@ -175,10 +194,24 @@ void nat46_netdev_destroy(struct net_dev +@@ -176,10 +195,24 @@ void nat46_netdev_destroy(struct net_dev netif_stop_queue(dev); netdev_nat46_set_instance(dev, NULL); unregister_netdev(dev); @@ -200,7 +200,7 @@ Signed-off-by: Pavithra R return (priv && (NAT46_DEVICE_SIGNATURE == priv->sig)); --- a/nat46/modules/nat46-netdev.h +++ b/nat46/modules/nat46-netdev.h -@@ -26,3 +26,6 @@ void nat64_show_all_configs(struct seq_f +@@ -26,3 +26,6 @@ void nat64_show_all_configs(struct net * void nat46_netdev_count_xmit(struct sk_buff *skb, struct net_device *dev); void *netdev_nat46_instance(struct net_device *dev); diff --git a/package/kernel/nat46/patches/105-longest-prefix-match.patch b/package/kernel/nat46/patches/105-longest-prefix-match.patch index 95fe6af973..af7f2c770b 100644 --- a/package/kernel/nat46/patches/105-longest-prefix-match.patch +++ b/package/kernel/nat46/patches/105-longest-prefix-match.patch @@ -622,7 +622,7 @@ Signed-off-by: Pavithra R int nat46_ipv6_input(struct sk_buff *old_skb); --- a/nat46/modules/nat46-netdev.c +++ b/nat46/modules/nat46-netdev.c -@@ -270,7 +270,14 @@ int nat46_insert(char *devname, char *bu +@@ -270,7 +270,14 @@ int nat46_insert(struct net *net, char * int ret = -1; if(dev) { nat46_instance_t *nat46 = netdev_nat46_instance(dev); diff --git a/package/kernel/nat46/patches/106-dummy_header.patch b/package/kernel/nat46/patches/106-dummy_header.patch index 1d4351166f..bad08339e6 100644 --- a/package/kernel/nat46/patches/106-dummy_header.patch +++ b/package/kernel/nat46/patches/106-dummy_header.patch @@ -76,7 +76,7 @@ Signed-off-by: Pavithra R #endif --- a/nat46/modules/nat46-module.c +++ b/nat46/modules/nat46-module.c -@@ -56,12 +56,16 @@ MODULE_AUTHOR("Andrew Yourtchenko priv_flags_ext = IFF_EXT_MAPT; } - int nat46_netdev_create(char *basename, struct net_device **dev) + int nat46_netdev_create(struct net *net, char *basename, struct net_device **dev)