mirror of
https://github.com/breeze303/openwrt-ipq.git
synced 2025-12-21 19:45:23 +00:00
nat46: Bump to version 2024-08-12
Brings in following changes ``` 2024-07-31|b42c37d|Fix crash when viewing nat46 kernel module config 2024-07-18|3a9f630|nat46-module: fix modpost warning 2024-07-02|cb69317| "Add network namespace awareness to nat46" - take two. ``` Signed-off-by: Sean Khan <datapronix@protonmail.com>
This commit is contained in:
parent
287b057d2e
commit
fdafa477c2
@ -3,11 +3,11 @@ include $(INCLUDE_DIR)/kernel.mk
|
|||||||
|
|
||||||
PKG_NAME:=nat46
|
PKG_NAME:=nat46
|
||||||
|
|
||||||
PKG_MIRROR_HASH:=09b93f31d10030d3b4f326066b544b70b1f60236d0482f27c384ed93b298c0a6
|
|
||||||
PKG_SOURCE_URL:=https://github.com/ayourtch/nat46.git
|
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_PROTO:=git
|
||||||
PKG_SOURCE_VERSION:=4c5beee236841724219598fabb1edc93d4f08ce5
|
PKG_SOURCE_VERSION:=b42c37d5c6dee4593df0fc60b37bc7ec4ee243a4
|
||||||
|
PKG_MIRROR_HASH:=2d7bbb6cc22808f7e81d716e6bd7a27d9978fb802496304851946627e21534a5
|
||||||
|
|
||||||
PKG_MAINTAINER:=Hans Dedecker <dedeckeh@gmail.com>
|
PKG_MAINTAINER:=Hans Dedecker <dedeckeh@gmail.com>
|
||||||
PKG_LICENSE:=GPL-2.0
|
PKG_LICENSE:=GPL-2.0
|
||||||
|
|||||||
@ -161,7 +161,7 @@ Signed-off-by: Pavithra R <pavir@codeaurora.org>
|
|||||||
void *netdev_nat46_instance(struct net_device *dev) {
|
void *netdev_nat46_instance(struct net_device *dev) {
|
||||||
nat46_netdev_priv_t *priv = netdev_priv(dev);
|
nat46_netdev_priv_t *priv = netdev_priv(dev);
|
||||||
return priv->nat46;
|
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);
|
printk("nat46: netdevice nat46 '%s' created successfully.\n", devname);
|
||||||
kfree(devname);
|
kfree(devname);
|
||||||
|
|
||||||
@ -173,7 +173,7 @@ Signed-off-by: Pavithra R <pavir@codeaurora.org>
|
|||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
err_register_dev:
|
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);
|
netif_stop_queue(dev);
|
||||||
netdev_nat46_set_instance(dev, NULL);
|
netdev_nat46_set_instance(dev, NULL);
|
||||||
unregister_netdev(dev);
|
unregister_netdev(dev);
|
||||||
@ -200,7 +200,7 @@ Signed-off-by: Pavithra R <pavir@codeaurora.org>
|
|||||||
return (priv && (NAT46_DEVICE_SIGNATURE == priv->sig));
|
return (priv && (NAT46_DEVICE_SIGNATURE == priv->sig));
|
||||||
--- a/nat46/modules/nat46-netdev.h
|
--- a/nat46/modules/nat46-netdev.h
|
||||||
+++ b/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 nat46_netdev_count_xmit(struct sk_buff *skb, struct net_device *dev);
|
||||||
void *netdev_nat46_instance(struct net_device *dev);
|
void *netdev_nat46_instance(struct net_device *dev);
|
||||||
|
|
||||||
|
|||||||
@ -622,7 +622,7 @@ Signed-off-by: Pavithra R <pavir@codeaurora.org>
|
|||||||
int nat46_ipv6_input(struct sk_buff *old_skb);
|
int nat46_ipv6_input(struct sk_buff *old_skb);
|
||||||
--- a/nat46/modules/nat46-netdev.c
|
--- a/nat46/modules/nat46-netdev.c
|
||||||
+++ b/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;
|
int ret = -1;
|
||||||
if(dev) {
|
if(dev) {
|
||||||
nat46_instance_t *nat46 = netdev_nat46_instance(dev);
|
nat46_instance_t *nat46 = netdev_nat46_instance(dev);
|
||||||
|
|||||||
@ -76,7 +76,7 @@ Signed-off-by: Pavithra R <pavir@codeaurora.org>
|
|||||||
#endif
|
#endif
|
||||||
--- a/nat46/modules/nat46-module.c
|
--- a/nat46/modules/nat46-module.c
|
||||||
+++ b/nat46/modules/nat46-module.c
|
+++ b/nat46/modules/nat46-module.c
|
||||||
@@ -56,12 +56,16 @@ MODULE_AUTHOR("Andrew Yourtchenko <ayour
|
@@ -59,12 +59,16 @@ MODULE_AUTHOR("Andrew Yourtchenko <ayour
|
||||||
MODULE_DESCRIPTION("NAT46 stateless translation");
|
MODULE_DESCRIPTION("NAT46 stateless translation");
|
||||||
|
|
||||||
int debug = 0;
|
int debug = 0;
|
||||||
|
|||||||
@ -412,4 +412,4 @@ Date: Fri Dec 17 13:37:15 2021 -0800
|
|||||||
+ dev->priv_flags_ext = IFF_EXT_MAPT;
|
+ dev->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)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user