him411/nss-packages-breeze303
1
0
Fork 0
mirror of https://github.com/breeze303/nss-packages.git synced 2025-12-16 16:57:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

qca-nss-clients: update to 12.4

Browse Source
This commit is contained in:
dimfish 2023-11-14 11:55:08 +03:00
parent a116c007e5
commit b88a62e2db
19 changed files with 84 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qca/qca-nss-clients/Makefile
View File

@ -5,9 +5,9 @@ PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/nss-clients.git PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/nss-clients.git
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2023-01-20 PKG_SOURCE_DATE:=2023-10-04
PKG_SOURCE_VERSION:=a207a7ace19c55e473b7428108e7ad8982b67aa7 PKG_SOURCE_VERSION:=f058ae199b42f30be9925b2ed1ce53afb128200c
PKG_MIRROR_HASH:=a122da3f3764403d791a267c60b1082514dd3f243496ae0fbaec388726d5a841 PKG_MIRROR_HASH:=90401b577a7750d3b7eadb423700aab7e1da1af392637598e08f6007f23a92e1
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1

20
qca/qca-nss-clients/patches/0001-kernel-5.15-support-qdisc.patch
View File

@ -1,6 +1,6 @@
--- a/nss_qdisc/igs/nss_mirred.c --- a/nss_qdisc/igs/nss_mirred.c
+++ b/nss_qdisc/igs/nss_mirred.c +++ b/nss_qdisc/igs/nss_mirred.c
@@ -82,20 +82,24 @@ static const struct nla_policy nss_mirred_policy[TC_NSS_MIRRED_MAX + 1] = { @@ -82,20 +82,24 @@ static const struct nla_policy nss_mirre
* nss_mirred_init() * nss_mirred_init()
* Initialize the nss mirred action. * Initialize the nss mirred action.
*/ */
@ -33,7 +33,7 @@
struct nlattr *arr[TC_NSS_MIRRED_MAX + 1]; struct nlattr *arr[TC_NSS_MIRRED_MAX + 1];
struct tc_nss_mirred *parm; struct tc_nss_mirred *parm;
struct nss_mirred_tcf *act; struct nss_mirred_tcf *act;
@@ -239,8 +243,13 @@ static int nss_mirred_init(struct net *net, struct nlattr *nla, @@ -239,8 +243,13 @@ static int nss_mirred_init(struct net *n
} }
if (!ret) { if (!ret) {
@ -49,7 +49,7 @@
return ret; return ret;
--- a/nss_qdisc/nss_bf.c --- a/nss_qdisc/nss_bf.c
+++ b/nss_qdisc/nss_bf.c +++ b/nss_qdisc/nss_bf.c
@@ -74,7 +74,7 @@ static inline struct nss_bf_class_data *nss_bf_find_class(u32 classid, @@ -74,7 +74,7 @@ static inline struct nss_bf_class_data *
*/ */
#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0))
static int nss_bf_change_class(struct Qdisc *sch, u32 classid, u32 parentid, static int nss_bf_change_class(struct Qdisc *sch, u32 classid, u32 parentid,
@ -58,7 +58,7 @@
{ {
struct netlink_ext_ack *extack = NULL; struct netlink_ext_ack *extack = NULL;
#else #else
@@ -290,7 +290,11 @@ static void nss_bf_destroy_class(struct Qdisc *sch, struct nss_bf_class_data *cl @@ -290,7 +290,11 @@ static void nss_bf_destroy_class(struct
* nss_bf_delete_class() * nss_bf_delete_class()
* Detaches a class from operation, but does not destroy it. * Detaches a class from operation, but does not destroy it.
*/ */
@ -72,7 +72,7 @@
struct nss_bf_class_data *cl = (struct nss_bf_class_data *)arg; struct nss_bf_class_data *cl = (struct nss_bf_class_data *)arg;
--- a/nss_qdisc/nss_htb.c --- a/nss_qdisc/nss_htb.c
+++ b/nss_qdisc/nss_htb.c +++ b/nss_qdisc/nss_htb.c
@@ -282,7 +282,7 @@ static int nss_htb_ppe_change_class(struct Qdisc *sch, struct nss_htb_class_data @@ -282,7 +282,7 @@ static int nss_htb_ppe_change_class(stru
*/ */
#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0))
static int nss_htb_change_class(struct Qdisc *sch, u32 classid, u32 parentid, static int nss_htb_change_class(struct Qdisc *sch, u32 classid, u32 parentid,
@ -81,7 +81,7 @@
{ {
struct netlink_ext_ack *extack = NULL; struct netlink_ext_ack *extack = NULL;
#else #else
@@ -516,7 +516,11 @@ static void nss_htb_destroy_class(struct Qdisc *sch, struct nss_htb_class_data * @@ -516,7 +516,11 @@ static void nss_htb_destroy_class(struct
* nss_htb_delete_class() * nss_htb_delete_class()
* Detaches a class from operation, but does not destroy it. * Detaches a class from operation, but does not destroy it.
*/ */
@ -95,7 +95,7 @@
struct nss_htb_class_data *cl = (struct nss_htb_class_data *)arg; struct nss_htb_class_data *cl = (struct nss_htb_class_data *)arg;
--- a/nss_qdisc/nss_qdisc.c --- a/nss_qdisc/nss_qdisc.c
+++ b/nss_qdisc/nss_qdisc.c +++ b/nss_qdisc/nss_qdisc.c
@@ -1140,15 +1140,16 @@ unsigned int nss_qdisc_drop(struct Qdisc *sch) @@ -1140,15 +1140,16 @@ unsigned int nss_qdisc_drop(struct Qdisc
{ {
struct nss_qdisc *nq = qdisc_priv(sch); struct nss_qdisc *nq = qdisc_priv(sch);
unsigned int ret; unsigned int ret;
@ -114,7 +114,7 @@
spin_unlock_bh(&nq->bounce_protection_lock); spin_unlock_bh(&nq->bounce_protection_lock);
} }
@@ -1209,10 +1210,10 @@ static bool nss_qdisc_iterate_fl(struct sk_buff *skb, struct Qdisc *sch) @@ -1209,10 +1210,10 @@ static bool nss_qdisc_iterate_fl(struct
return 0; return 0;
} }
@ -128,7 +128,7 @@
#endif #endif
if ((status == TC_ACT_STOLEN) || (status == TC_ACT_QUEUED)) { if ((status == TC_ACT_STOLEN) || (status == TC_ACT_QUEUED)) {
return 1; return 1;
@@ -2188,6 +2189,8 @@ int __nss_qdisc_init(struct Qdisc *sch, struct nss_qdisc *nq, nss_shaper_node_ty @@ -2188,6 +2189,8 @@ int __nss_qdisc_init(struct Qdisc *sch,
* This is to prevent mixing NSS and PPE qdisc with linux qdisc. * This is to prevent mixing NSS and PPE qdisc with linux qdisc.
*/ */
if ((parent != TC_H_ROOT) && (root->ops->owner != THIS_MODULE)) { if ((parent != TC_H_ROOT) && (root->ops->owner != THIS_MODULE)) {
@ -139,7 +139,7 @@
} }
--- a/nss_qdisc/nss_wrr.c --- a/nss_qdisc/nss_wrr.c
+++ b/nss_qdisc/nss_wrr.c +++ b/nss_qdisc/nss_wrr.c
@@ -229,7 +229,7 @@ static int nss_wrr_ppe_change_class(struct Qdisc *sch, struct nss_wrr_class_data @@ -229,7 +229,7 @@ static int nss_wrr_ppe_change_class(stru
#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0))
static int nss_wrr_change_class(struct Qdisc *sch, u32 classid, u32 parentid, static int nss_wrr_change_class(struct Qdisc *sch, u32 classid, u32 parentid,

2
qca/qca-nss-clients/patches/0002-kernel-5.4-support-gre.patch
View File

@ -27,5 +27,5 @@
+ .proc_release = single_release, + .proc_release = single_release,
+ .proc_write = nss_connmgr_gre_test_write_proc, + .proc_write = nss_connmgr_gre_test_write_proc,
}; };
/* /*

8
qca/qca-nss-clients/patches/0003-kernel-5.4-support-ipsec.patch
View File

@ -8,7 +8,7 @@
+void nss_ipsecmgr_tunnel_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats) +void nss_ipsecmgr_tunnel_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)
{ {
struct nss_ipsecmgr_priv *priv = netdev_priv(dev); struct nss_ipsecmgr_priv *priv = netdev_priv(dev);
@@ -389,8 +389,6 @@ static struct rtnl_link_stats64 *nss_ips @@ -389,8 +389,6 @@ static struct rtnl_link_stats64 *nss_ips
read_lock_bh(&ipsecmgr_ctx->lock); read_lock_bh(&ipsecmgr_ctx->lock);
memcpy(stats, &priv->stats, sizeof(struct rtnl_link_stats64)); memcpy(stats, &priv->stats, sizeof(struct rtnl_link_stats64));
@ -16,14 +16,14 @@
- -
- return stats; - return stats;
} }
/* /*
@@ -442,7 +440,7 @@ static void nss_ipsecmgr_tunnel_setup(st @@ -442,7 +440,7 @@ static void nss_ipsecmgr_tunnel_setup(st
dev->header_ops = NULL; dev->header_ops = NULL;
dev->netdev_ops = &nss_ipsecmgr_tunnel_ops; dev->netdev_ops = &nss_ipsecmgr_tunnel_ops;
- dev->destructor = nss_ipsecmgr_tunnel_free; - dev->destructor = nss_ipsecmgr_tunnel_free;
+ dev->priv_destructor = nss_ipsecmgr_tunnel_free; + dev->priv_destructor = nss_ipsecmgr_tunnel_free;
/* /*
* get the MAC address from the ethernet device * get the MAC address from the ethernet device

2
qca/qca-nss-clients/patches/0004-kernel-5.4-support-dtls.patch
View File

@ -6,6 +6,6 @@
dev->netdev_ops = &nss_dtlsmgr_session_ops; dev->netdev_ops = &nss_dtlsmgr_session_ops;
- dev->destructor = NULL; - dev->destructor = NULL;
+ dev->priv_destructor = NULL; + dev->priv_destructor = NULL;
memcpy(dev->dev_addr, "\xaa\xbb\xcc\xdd\xee\xff", dev->addr_len); memcpy(dev->dev_addr, "\xaa\xbb\xcc\xdd\xee\xff", dev->addr_len);
memset(dev->broadcast, 0xff, dev->addr_len); memset(dev->broadcast, 0xff, dev->addr_len);

16
qca/qca-nss-clients/patches/0005-vlanmgr-fix-compile-error.patch
View File

@ -1,6 +1,6 @@
--- a/vlan/nss_vlan_mgr.c --- a/vlan/nss_vlan_mgr.c
+++ b/vlan/nss_vlan_mgr.c +++ b/vlan/nss_vlan_mgr.c
@@ -800,8 +800,10 @@ static struct nss_vlan_pvt *nss_vlan_mgr_create_instance( @@ -800,8 +800,10 @@ static struct nss_vlan_pvt *nss_vlan_mgr
*/ */
static void nss_vlan_mgr_instance_free(struct nss_vlan_pvt *v) static void nss_vlan_mgr_instance_free(struct nss_vlan_pvt *v)
{ {
@ -8,10 +8,10 @@
int32_t i; int32_t i;
int ret = 0; int ret = 0;
+#endif +#endif
spin_lock(&vlan_mgr_ctx.lock); spin_lock(&vlan_mgr_ctx.lock);
BUG_ON(--v->refs); BUG_ON(--v->refs);
@@ -961,8 +963,11 @@ static int nss_vlan_mgr_register_event(struct netdev_notifier_info *info) @@ -961,8 +963,11 @@ static int nss_vlan_mgr_register_event(s
int ret; int ret;
#endif #endif
uint32_t vlan_tag; uint32_t vlan_tag;
@ -32,7 +32,7 @@
struct net_device *real_dev; struct net_device *real_dev;
int ret; int ret;
+#endif +#endif
if (!v) if (!v)
return 0; return 0;
@@ -1416,8 +1423,10 @@ EXPORT_SYMBOL(nss_vlan_mgr_join_bridge); @@ -1416,8 +1423,10 @@ EXPORT_SYMBOL(nss_vlan_mgr_join_bridge);
@ -43,17 +43,17 @@
struct net_device *real_dev; struct net_device *real_dev;
int ret; int ret;
+#endif +#endif
if (!v) if (!v)
return 0; return 0;
--- a/vlan/Makefile --- a/vlan/Makefile
+++ b/vlan/Makefile +++ b/vlan/Makefile
@@ -8,7 +8,7 @@ ifeq ($(SoC),$(filter $(SoC),ipq807x ipq807x_64 ipq60xx ipq60xx_64)) @@ -8,7 +8,7 @@ ifeq ($(SoC),$(filter $(SoC),ipq807x ipq
ccflags-y += -DNSS_VLAN_MGR_PPE_SUPPORT ccflags-y += -DNSS_VLAN_MGR_PPE_SUPPORT
endif endif
-ccflags-y += -DNSS_VLAN_MGR_DEBUG_LEVEL=0 -ccflags-y += -DNSS_VLAN_MGR_DEBUG_LEVEL=0
+ccflags-y += -DNSS_VLAN_MGR_DEBUG_LEVEL=4 +ccflags-y += -DNSS_VLAN_MGR_DEBUG_LEVEL=4
ccflags-y += -Wall -Werror ccflags-y += -Wall -Werror
ifneq (,$(filter $(CONFIG_BONDING),y m)) ifneq (,$(filter $(CONFIG_BONDING),y m))

4
qca/qca-nss-clients/patches/0006-match-fix-compile-error.patch
View File

@ -10,14 +10,14 @@
#else #else
#define nss_match_warn(s, ...) pr_warn("%s[%d]:" s, __FUNCTION__, __LINE__, ##__VA_ARGS__) #define nss_match_warn(s, ...) pr_warn("%s[%d]:" s, __FUNCTION__, __LINE__, ##__VA_ARGS__)
#endif #endif
-#if (NSS_match_DEBUG_LEVEL < 3) -#if (NSS_match_DEBUG_LEVEL < 3)
+#if (NSS_MATCH_DEBUG_LEVEL < 3) +#if (NSS_MATCH_DEBUG_LEVEL < 3)
#define nss_match_info(s, ...) #define nss_match_info(s, ...)
#else #else
#define nss_match_info(s, ...) pr_notice("%s[%d]:" s, __FUNCTION__, __LINE__, ##__VA_ARGS__) #define nss_match_info(s, ...) pr_notice("%s[%d]:" s, __FUNCTION__, __LINE__, ##__VA_ARGS__)
#endif #endif
-#if (NSS_match_DEBUG_LEVEL < 4) -#if (NSS_match_DEBUG_LEVEL < 4)
+#if (NSS_MATCH_DEBUG_LEVEL < 4) +#if (NSS_MATCH_DEBUG_LEVEL < 4)
#define nss_match_trace(s, ...) #define nss_match_trace(s, ...)

10
qca/qca-nss-clients/patches/0007-bridge-fix-compile-error.patch
View File

@ -1,6 +1,6 @@
--- a/bridge/nss_bridge_mgr.c --- a/bridge/nss_bridge_mgr.c
+++ b/bridge/nss_bridge_mgr.c +++ b/bridge/nss_bridge_mgr.c
@@ -1092,8 +1092,10 @@ int nss_bridge_mgr_register_br(struct net_device *dev) @@ -1098,8 +1098,10 @@ int nss_bridge_mgr_register_br(struct ne
*/ */
b_pvt->ifnum = ifnum; b_pvt->ifnum = ifnum;
b_pvt->mtu = dev->mtu; b_pvt->mtu = dev->mtu;
@ -11,19 +11,19 @@
ether_addr_copy(b_pvt->dev_addr, dev->dev_addr); ether_addr_copy(b_pvt->dev_addr, dev->dev_addr);
spin_lock(&br_mgr_ctx.lock); spin_lock(&br_mgr_ctx.lock);
list_add(&b_pvt->list, &br_mgr_ctx.list); list_add(&b_pvt->list, &br_mgr_ctx.list);
@@ -1159,6 +1161,7 @@ static int nss_bridge_mgr_bond_slave_changeupper(struct netdev_notifier_changeup @@ -1165,6 +1167,7 @@ static int nss_bridge_mgr_bond_slave_cha
return NOTIFY_DONE; return NOTIFY_DONE;
} }
+#if defined(NSS_BRIDGE_MGR_PPE_SUPPORT) +#if defined(NSS_BRIDGE_MGR_PPE_SUPPORT)
/* /*
* Add or remove the slave based based on linking event * Add or remove the slave based based on linking event
*/ */
@@ -1173,6 +1176,7 @@ static int nss_bridge_mgr_bond_slave_changeupper(struct netdev_notifier_changeup @@ -1179,6 +1182,7 @@ static int nss_bridge_mgr_bond_slave_cha
cu_info->upper_dev->name, master->name); cu_info->upper_dev->name, master->name);
} }
} }
+#endif +#endif
return NOTIFY_DONE; return NOTIFY_DONE;
} }

8
qca/qca-nss-clients/patches/0008-profiler-fix-compile-error.patch
View File

@ -11,7 +11,7 @@
@@ -937,12 +938,26 @@ static ssize_t debug_if(struct file *fil @@ -937,12 +938,26 @@ static ssize_t debug_if(struct file *fil
return count; return count;
} }
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)
+#define HAVE_PROC_OPS +#define HAVE_PROC_OPS
+#endif +#endif
@ -32,13 +32,13 @@
.write = debug_if, .write = debug_if,
}; };
+#endif +#endif
/* /*
* showing sample status on Linux console * showing sample status on Linux console
@@ -971,6 +986,15 @@ static ssize_t profile_rate_write(struct @@ -971,6 +986,15 @@ static ssize_t profile_rate_write(struct
return 0; return 0;
} }
+#ifdef HAVE_PROC_OPS +#ifdef HAVE_PROC_OPS
+static const struct proc_ops profile_rate_fops = { +static const struct proc_ops profile_rate_fops = {
+ .proc_open = profile_rate_open, + .proc_open = profile_rate_open,
@ -56,6 +56,6 @@
.write = profile_rate_write, .write = profile_rate_write,
}; };
+#endif +#endif
/* /*
* hexdump * hexdump

4
qca/qca-nss-clients/patches/0009-gre-fix-compile-error.patch
View File

@ -3,7 +3,7 @@
@@ -172,14 +172,6 @@ int nss_connmgr_gre_v4_set_config(struct @@ -172,14 +172,6 @@ int nss_connmgr_gre_v4_set_config(struct
} }
} }
- /* - /*
- * IP address validate - * IP address validate
- */ - */
@ -13,5 +13,5 @@
- } - }
- -
memset(t, 0, sizeof(struct ip_tunnel)); memset(t, 0, sizeof(struct ip_tunnel));
priv->pad_len = (cfg->add_padding) ? GRE_HDR_PAD_LEN : 0; priv->pad_len = (cfg->add_padding) ? GRE_HDR_PAD_LEN : 0;

8
qca/qca-nss-clients/patches/0010-fix-portifmgr.patch
View File

@ -2,7 +2,7 @@
+++ b/portifmgr/nss_portifmgr.c +++ b/portifmgr/nss_portifmgr.c
@@ -187,16 +187,20 @@ drop: @@ -187,16 +187,20 @@ drop:
} }
/* /*
- * nss_portifmgr_get_stats() - * nss_portifmgr_get_stats()
+ * nss_portifmgr_get_stats64() + * nss_portifmgr_get_stats64()
@ -18,11 +18,11 @@
{ {
struct nss_portifmgr_priv *priv = (struct nss_portifmgr_priv *)netdev_priv(dev); struct nss_portifmgr_priv *priv = (struct nss_portifmgr_priv *)netdev_priv(dev);
BUG_ON(priv == NULL); BUG_ON(priv == NULL);
nss_portid_get_stats(priv->if_num, stats); nss_portid_get_stats(priv->if_num, stats);
- return stats; - return stats;
} }
/* /*
@@ -225,7 +229,7 @@ static const struct net_device_ops nss_p @@ -225,7 +229,7 @@ static const struct net_device_ops nss_p
.ndo_start_xmit = nss_portifmgr_start_xmit, .ndo_start_xmit = nss_portifmgr_start_xmit,
@ -31,5 +31,5 @@
- .ndo_get_stats64 = nss_portifmgr_get_stats, - .ndo_get_stats64 = nss_portifmgr_get_stats,
+ .ndo_get_stats64 = nss_portifmgr_get_stats64, + .ndo_get_stats64 = nss_portifmgr_get_stats64,
}; };
/* /*

6
qca/qca-nss-clients/patches/0011-dtlsmgr-fix-SHA-header-include-in-5.15.patch
View File

@ -13,7 +13,7 @@
+#endif +#endif
#include <crypto/skcipher.h> #include <crypto/skcipher.h>
#include <crypto/hash.h> #include <crypto/hash.h>
--- a/dtls/v2.0/nss_dtlsmgr_ctx.c --- a/dtls/v2.0/nss_dtlsmgr_ctx.c
+++ b/dtls/v2.0/nss_dtlsmgr_ctx.c +++ b/dtls/v2.0/nss_dtlsmgr_ctx.c
@@ -40,7 +40,13 @@ @@ -40,7 +40,13 @@
@ -29,7 +29,7 @@
+#endif +#endif
#include <crypto/skcipher.h> #include <crypto/skcipher.h>
#include <crypto/hash.h> #include <crypto/hash.h>
--- a/dtls/v2.0/nss_dtlsmgr_ctx_dev.c --- a/dtls/v2.0/nss_dtlsmgr_ctx_dev.c
+++ b/dtls/v2.0/nss_dtlsmgr_ctx_dev.c +++ b/dtls/v2.0/nss_dtlsmgr_ctx_dev.c
@@ -36,7 +36,13 @@ @@ -36,7 +36,13 @@
@ -43,6 +43,6 @@
+#include <crypto/sha1.h> +#include <crypto/sha1.h>
+#include <crypto/sha2.h> +#include <crypto/sha2.h>
+#endif +#endif
#include <nss_api_if.h> #include <nss_api_if.h>
#include <nss_dynamic_interface.h> #include <nss_dynamic_interface.h>

8
qca/qca-nss-clients/patches/0012-dtlsmgr-fix-debug-print-in-5.15.patch
View File

@ -11,7 +11,7 @@
+#define nss_dtlsmgr_info(s, ...) pr_debug("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__); +#define nss_dtlsmgr_info(s, ...) pr_debug("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__);
+#define nss_dtlsmgr_trace(s, ...) pr_debug("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__); +#define nss_dtlsmgr_trace(s, ...) pr_debug("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__);
#else #else
/* /*
@@ -46,17 +46,17 @@ @@ -46,17 +46,17 @@
*/ */
@ -20,17 +20,17 @@
- pr_warn("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__) \ - pr_warn("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__) \
+ pr_warn("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__); \ + pr_warn("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__); \
} }
#define nss_dtlsmgr_info(s, ...) { \ #define nss_dtlsmgr_info(s, ...) { \
if (NSS_DTLSMGR_DEBUG_LEVEL > NSS_DTLSMGR_DEBUG_LEVEL_WARN) \ if (NSS_DTLSMGR_DEBUG_LEVEL > NSS_DTLSMGR_DEBUG_LEVEL_WARN) \
- pr_notice("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__) \ - pr_notice("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__) \
+ pr_notice("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__); \ + pr_notice("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__); \
} }
#define nss_dtlsmgr_trace(s, ...) { \ #define nss_dtlsmgr_trace(s, ...) { \
if (NSS_DTLSMGR_DEBUG_LEVEL > NSS_DTLSMGR_DEBUG_LEVEL_INFO) \ if (NSS_DTLSMGR_DEBUG_LEVEL > NSS_DTLSMGR_DEBUG_LEVEL_INFO) \
- pr_info("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__) \ - pr_info("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__) \
+ pr_info("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__); \ + pr_info("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__); \
} }
#endif /* CONFIG_DYNAMIC_DEBUG */ #endif /* CONFIG_DYNAMIC_DEBUG */

2
qca/qca-nss-clients/patches/0013-tlsmgr-fix-SHA-header-include-in-5.15.patch
View File

@ -27,6 +27,6 @@
+#include <crypto/sha1.h> +#include <crypto/sha1.h>
+#include <crypto/sha2.h> +#include <crypto/sha2.h>
+#endif +#endif
#include <nss_api_if.h> #include <nss_api_if.h>
#include <nss_dynamic_interface.h> #include <nss_dynamic_interface.h>

4
qca/qca-nss-clients/patches/0014-ovpnmgr-fix-SHA-header-include-in-5.15.patch
View File

@ -12,7 +12,7 @@
+#include <crypto/sha2.h> +#include <crypto/sha2.h>
+#endif +#endif
#include <crypto/hash.h> #include <crypto/hash.h>
#include <nss_api_if.h> #include <nss_api_if.h>
--- a/openvpn/src/nss_ovpnmgr_route.c --- a/openvpn/src/nss_ovpnmgr_route.c
+++ b/openvpn/src/nss_ovpnmgr_route.c +++ b/openvpn/src/nss_ovpnmgr_route.c
@ -28,5 +28,5 @@
+#include <crypto/sha2.h> +#include <crypto/sha2.h>
+#endif +#endif
#include <crypto/hash.h> #include <crypto/hash.h>
#include <nss_api_if.h> #include <nss_api_if.h>

2
qca/qca-nss-clients/patches/0015-tunipip6-fix-compile-error-in-5.15.patch
View File

@ -6,6 +6,6 @@
int cpu; int cpu;
- int8_t ver = skb->data[0] >> 4; - int8_t ver = skb->data[0] >> 4;
+ __attribute__((unused)) int8_t ver = skb->data[0] >> 4; + __attribute__((unused)) int8_t ver = skb->data[0] >> 4;
nss_tunipip6_trace("%px: received - %d bytes name %s ver %x\n", nss_tunipip6_trace("%px: received - %d bytes name %s ver %x\n",
dev, skb->len, dev->name, ver); dev, skb->len, dev->name, ver);

2
qca/qca-nss-clients/patches/0016-vxlanmgr-fix-compile-error-in-5.15.patch
View File

@ -6,6 +6,6 @@
nss_vxlanmgr_get_ipsec_if_num_by_ip_callback_t ipsec_cb; nss_vxlanmgr_get_ipsec_if_num_by_ip_callback_t ipsec_cb;
- struct nss_ctx_instance *nss_ctx = nss_vxlan_get_ctx(); - struct nss_ctx_instance *nss_ctx = nss_vxlan_get_ctx();
+ __attribute__((unused)) struct nss_ctx_instance *nss_ctx = nss_vxlan_get_ctx(); + __attribute__((unused)) struct nss_ctx_instance *nss_ctx = nss_vxlan_get_ctx();
/* /*
* Check if the VxLAN interface is applied over an IPsec interface by querying the IPsec. * Check if the VxLAN interface is applied over an IPsec interface by querying the IPsec.

12
qca/qca-nss-clients/patches/0017-tlsmgr-fix-debug-print-in-5.15.patch
View File

@ -3,32 +3,32 @@
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
#define NSS_TLSMGR_DEBUG_LEVEL_INFO 3 #define NSS_TLSMGR_DEBUG_LEVEL_INFO 3
#define NSS_TLSMGR_DEBUG_LEVEL_TRACE 4 #define NSS_TLSMGR_DEBUG_LEVEL_TRACE 4
-#define nss_tlsmgr_info_always(s, ...) pr_info("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__) -#define nss_tlsmgr_info_always(s, ...) pr_info("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__)
+#define nss_tlsmgr_info_always(s, ...) pr_info("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__); +#define nss_tlsmgr_info_always(s, ...) pr_info("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__);
#define nss_tlsmgr_error(s, ...) do { \ #define nss_tlsmgr_error(s, ...) do { \
if (net_ratelimit()) { \ if (net_ratelimit()) { \
@@ -43,18 +43,18 @@ @@ -43,18 +43,18 @@
} while (0) } while (0)
#if defined(CONFIG_DYNAMIC_DEBUG) #if defined(CONFIG_DYNAMIC_DEBUG)
-#define nss_tlsmgr_info(s, ...) pr_debug("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__) -#define nss_tlsmgr_info(s, ...) pr_debug("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__)
-#define nss_tlsmgr_trace(s, ...) pr_debug("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__) -#define nss_tlsmgr_trace(s, ...) pr_debug("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__)
+#define nss_tlsmgr_info(s, ...) pr_debug("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__); +#define nss_tlsmgr_info(s, ...) pr_debug("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__);
+#define nss_tlsmgr_trace(s, ...) pr_debug("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__); +#define nss_tlsmgr_trace(s, ...) pr_debug("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__);
#else #else
#define nss_tlsmgr_info(s, ...) { \ #define nss_tlsmgr_info(s, ...) { \
if (NSS_TLSMGR_DEBUG_LEVEL > NSS_TLSMGR_DEBUG_LEVEL_WARN) \ if (NSS_TLSMGR_DEBUG_LEVEL > NSS_TLSMGR_DEBUG_LEVEL_WARN) \
- pr_notice("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__) \ - pr_notice("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__) \
+ pr_notice("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__); \ + pr_notice("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__); \
} }
#define nss_tlsmgr_trace(s, ...) { \ #define nss_tlsmgr_trace(s, ...) { \
if (NSS_TLSMGR_DEBUG_LEVEL > NSS_TLSMGR_DEBUG_LEVEL_INFO) \ if (NSS_TLSMGR_DEBUG_LEVEL > NSS_TLSMGR_DEBUG_LEVEL_INFO) \
- pr_info("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__) \ - pr_info("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__) \
+ pr_info("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__); \ + pr_info("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__); \
} }
#endif /* CONFIG_DYNAMIC_DEBUG */ #endif /* CONFIG_DYNAMIC_DEBUG */

53
qca/qca-nss-clients/patches/0018-kernel-6.1-support.patch
View File

@ -1,18 +1,18 @@
--- a/bridge/nss_bridge_mgr.c --- a/bridge/nss_bridge_mgr.c
+++ b/bridge/nss_bridge_mgr.c +++ b/bridge/nss_bridge_mgr.c
@@ -1075,7 +1075,7 @@ int nss_bridge_mgr_register_br(struct ne @@ -1081,7 +1081,7 @@ int nss_bridge_mgr_register_br(struct ne
} }
#endif #endif
- err = nss_bridge_tx_set_mac_addr_msg(ifnum, dev->dev_addr); - err = nss_bridge_tx_set_mac_addr_msg(ifnum, dev->dev_addr);
+ err = nss_bridge_tx_set_mac_addr_msg(ifnum, (uint8_t *) dev->dev_addr); + err = nss_bridge_tx_set_mac_addr_msg(ifnum, (uint8_t *) dev->dev_addr);
if (err != NSS_TX_SUCCESS) { if (err != NSS_TX_SUCCESS) {
nss_bridge_mgr_warn("%px: failed to set mac_addr msg, error = %d\n", b_pvt, err); nss_bridge_mgr_warn("%px: failed to set mac_addr msg, error = %d\n", b_pvt, err);
goto fail_4; goto fail_4;
@@ -1236,7 +1236,7 @@ static int nss_bridge_mgr_changeaddr_eve @@ -1242,7 +1242,7 @@ static int nss_bridge_mgr_changeaddr_eve
nss_bridge_mgr_trace("%px: MAC changed to %pM, update NSS\n", b_pvt, dev->dev_addr); nss_bridge_mgr_trace("%px: MAC changed to %pM, update NSS\n", b_pvt, dev->dev_addr);
- if (nss_bridge_tx_set_mac_addr_msg(b_pvt->ifnum, dev->dev_addr) != NSS_TX_SUCCESS) { - if (nss_bridge_tx_set_mac_addr_msg(b_pvt->ifnum, dev->dev_addr) != NSS_TX_SUCCESS) {
+ if (nss_bridge_tx_set_mac_addr_msg(b_pvt->ifnum, (uint8_t *) dev->dev_addr) != NSS_TX_SUCCESS) { + if (nss_bridge_tx_set_mac_addr_msg(b_pvt->ifnum, (uint8_t *) dev->dev_addr) != NSS_TX_SUCCESS) {
nss_bridge_mgr_warn("%px: Failed to send change MAC address message to NSS\n", b_pvt); nss_bridge_mgr_warn("%px: Failed to send change MAC address message to NSS\n", b_pvt);
@ -38,7 +38,7 @@
- return single_open(filp, nss_connmgr_gre_test_show_proc, PDE_DATA(inode)); - return single_open(filp, nss_connmgr_gre_test_show_proc, PDE_DATA(inode));
+ return single_open(filp, nss_connmgr_gre_test_show_proc, pde_data(inode)); + return single_open(filp, nss_connmgr_gre_test_show_proc, pde_data(inode));
} }
/* /*
--- a/gre/nss_connmgr_gre.c --- a/gre/nss_connmgr_gre.c
+++ b/gre/nss_connmgr_gre.c +++ b/gre/nss_connmgr_gre.c
@ -76,7 +76,7 @@
--- a/tunipip6/nss_connmgr_tunipip6.c --- a/tunipip6/nss_connmgr_tunipip6.c
+++ b/tunipip6/nss_connmgr_tunipip6.c +++ b/tunipip6/nss_connmgr_tunipip6.c
@@ -354,11 +354,11 @@ static void nss_tunipip6_update_dev_stat @@ -354,11 +354,11 @@ static void nss_tunipip6_update_dev_stat
memset(&stats, 0, sizeof(stats)); memset(&stats, 0, sizeof(stats));
if (interface_type == NSS_DYNAMIC_INTERFACE_TYPE_TUNIPIP6_INNER) { if (interface_type == NSS_DYNAMIC_INTERFACE_TYPE_TUNIPIP6_INNER) {
- stats.tx_packets = sync_stats->node_stats.tx_packets; - stats.tx_packets = sync_stats->node_stats.tx_packets;
@ -99,10 +99,9 @@
tcf_lastuse_update(&act->tcf_tm); tcf_lastuse_update(&act->tcf_tm);
- bstats_cpu_update(this_cpu_ptr(act->common.cpu_bstats), skb); - bstats_cpu_update(this_cpu_ptr(act->common.cpu_bstats), skb);
+ bstats_update(this_cpu_ptr(act->common.cpu_bstats), skb); + bstats_update(this_cpu_ptr(act->common.cpu_bstats), skb);
rcu_read_lock(); rcu_read_lock();
retval = READ_ONCE(act->tcf_action); retval = READ_ONCE(act->tcf_action);
--- a/nss_qdisc/nss_qdisc.h --- a/nss_qdisc/nss_qdisc.h
+++ b/nss_qdisc/nss_qdisc.h +++ b/nss_qdisc/nss_qdisc.h
@@ -217,7 +217,7 @@ struct nss_qdisc { @@ -217,7 +217,7 @@ struct nss_qdisc {
@ -120,10 +119,9 @@
extern int nss_qdisc_gnet_stats_copy_basic(struct Qdisc *sch, extern int nss_qdisc_gnet_stats_copy_basic(struct Qdisc *sch,
- struct gnet_dump *d, struct gnet_stats_basic_packed *b); - struct gnet_dump *d, struct gnet_stats_basic_packed *b);
+ struct gnet_dump *d, struct gnet_stats_basic_sync *b); + struct gnet_dump *d, struct gnet_stats_basic_sync *b);
/* /*
* nss_qdisc_gnet_stats_copy_queue() * nss_qdisc_gnet_stats_copy_queue()
--- a/nss_qdisc/igs/nss_ifb.c --- a/nss_qdisc/igs/nss_ifb.c
+++ b/nss_qdisc/igs/nss_ifb.c +++ b/nss_qdisc/igs/nss_ifb.c
@@ -544,8 +544,10 @@ static void nss_ifb_update_dev_stats(str @@ -544,8 +544,10 @@ static void nss_ifb_update_dev_stats(str
@ -138,7 +136,7 @@
+ u64_stats_set(&stats.tx_bytes, node_stats->tx_bytes); + u64_stats_set(&stats.tx_bytes, node_stats->tx_bytes);
dev->stats.rx_dropped = dev->stats.tx_dropped += sync_stats->igs_stats.tx_dropped; dev->stats.rx_dropped = dev->stats.tx_dropped += sync_stats->igs_stats.tx_dropped;
u64_stats_update_end(&stats.syncp); u64_stats_update_end(&stats.syncp);
--- a/nss_qdisc/nss_qdisc.c --- a/nss_qdisc/nss_qdisc.c
+++ b/nss_qdisc/nss_qdisc.c +++ b/nss_qdisc/nss_qdisc.c
@@ -2608,12 +2608,14 @@ int nss_qdisc_init(struct Qdisc *sch, st @@ -2608,12 +2608,14 @@ int nss_qdisc_init(struct Qdisc *sch, st
@ -157,7 +155,6 @@
#else #else
return gnet_stats_copy_basic(qdisc_root_sleeping_running(sch), d, NULL, b); return gnet_stats_copy_basic(qdisc_root_sleeping_running(sch), d, NULL, b);
#endif #endif
--- a/nss_qdisc/nss_qdisc_stats.c --- a/nss_qdisc/nss_qdisc_stats.c
+++ b/nss_qdisc/nss_qdisc_stats.c +++ b/nss_qdisc/nss_qdisc_stats.c
@@ -160,7 +160,7 @@ static void nss_qdisc_stats_process_node @@ -160,7 +160,7 @@ static void nss_qdisc_stats_process_node
@ -177,43 +174,41 @@
- bstats->packets += response->sn_stats.delta.dequeued_packets; - bstats->packets += response->sn_stats.delta.dequeued_packets;
+ u64_stats_add(&bstats->bytes, (__u64)response->sn_stats.delta.dequeued_bytes); + u64_stats_add(&bstats->bytes, (__u64)response->sn_stats.delta.dequeued_bytes);
+ u64_stats_add(&bstats->packets, response->sn_stats.delta.dequeued_packets); + u64_stats_add(&bstats->packets, response->sn_stats.delta.dequeued_packets);
/* /*
* Update qdisc->qstats * Update qdisc->qstats
--- a/vlan/nss_vlan_mgr.c --- a/vlan/nss_vlan_mgr.c
+++ b/vlan/nss_vlan_mgr.c +++ b/vlan/nss_vlan_mgr.c
@@ -787,7 +787,7 @@ static struct nss_vlan_pvt *nss_vlan_mgr @@ -787,7 +787,7 @@ static struct nss_vlan_pvt *nss_vlan_mgr
} }
v->mtu = dev->mtu; v->mtu = dev->mtu;
- ether_addr_copy(v->dev_addr, dev->dev_addr); - ether_addr_copy(v->dev_addr, dev->dev_addr);
+ ether_addr_copy(v->dev_addr, (uint8_t *) dev->dev_addr); + ether_addr_copy(v->dev_addr, (uint8_t *) dev->dev_addr);
v->ifindex = dev->ifindex; v->ifindex = dev->ifindex;
v->refs = 1; v->refs = 1;
@@ -936,14 +936,14 @@ static int nss_vlan_mgr_changeaddr_event @@ -936,14 +936,14 @@ static int nss_vlan_mgr_changeaddr_event
} }
spin_unlock(&vlan_mgr_ctx.lock); spin_unlock(&vlan_mgr_ctx.lock);
- if (nss_vlan_tx_set_mac_addr_msg(v_pvt->nss_if, dev->dev_addr) != NSS_TX_SUCCESS) { - if (nss_vlan_tx_set_mac_addr_msg(v_pvt->nss_if, dev->dev_addr) != NSS_TX_SUCCESS) {
+ if (nss_vlan_tx_set_mac_addr_msg(v_pvt->nss_if, (uint8_t *) dev->dev_addr) != NSS_TX_SUCCESS) { + if (nss_vlan_tx_set_mac_addr_msg(v_pvt->nss_if, (uint8_t *) dev->dev_addr) != NSS_TX_SUCCESS) {
nss_vlan_mgr_warn("%s: Failed to send change MAC address message to NSS\n", dev->name); nss_vlan_mgr_warn("%s: Failed to send change MAC address message to NSS\n", dev->name);
nss_vlan_mgr_instance_deref(v_pvt); nss_vlan_mgr_instance_deref(v_pvt);
return NOTIFY_BAD; return NOTIFY_BAD;
} }
spin_lock(&vlan_mgr_ctx.lock); spin_lock(&vlan_mgr_ctx.lock);
- ether_addr_copy(v_pvt->dev_addr, dev->dev_addr); - ether_addr_copy(v_pvt->dev_addr, dev->dev_addr);
+ ether_addr_copy(v_pvt->dev_addr, (uint8_t *) dev->dev_addr); + ether_addr_copy(v_pvt->dev_addr, (uint8_t *) dev->dev_addr);
spin_unlock(&vlan_mgr_ctx.lock); spin_unlock(&vlan_mgr_ctx.lock);
nss_vlan_mgr_trace("%s: MAC changed to %pM, updated NSS\n", dev->name, dev->dev_addr); nss_vlan_mgr_trace("%s: MAC changed to %pM, updated NSS\n", dev->name, dev->dev_addr);
nss_vlan_mgr_instance_deref(v_pvt); nss_vlan_mgr_instance_deref(v_pvt);
--- a/vxlanmgr/nss_vxlanmgr_tunnel.c --- a/vxlanmgr/nss_vxlanmgr_tunnel.c
+++ b/vxlanmgr/nss_vxlanmgr_tunnel.c +++ b/vxlanmgr/nss_vxlanmgr_tunnel.c
@@ -489,8 +489,8 @@ static void nss_vxlanmgr_tunnel_inner_st @@ -489,8 +489,8 @@ static void nss_vxlanmgr_tunnel_inner_st
tstats = this_cpu_ptr(dev->tstats); tstats = this_cpu_ptr(dev->tstats);
u64_stats_update_begin(&tstats->syncp); u64_stats_update_begin(&tstats->syncp);
- tstats->tx_packets += stats->node_stats.tx_packets; - tstats->tx_packets += stats->node_stats.tx_packets;
@ -224,7 +219,7 @@
netdev_stats->tx_dropped += dropped; netdev_stats->tx_dropped += dropped;
} }
@@ -526,8 +526,8 @@ static void nss_vxlanmgr_tunnel_outer_st @@ -526,8 +526,8 @@ static void nss_vxlanmgr_tunnel_outer_st
tstats = this_cpu_ptr(dev->tstats); tstats = this_cpu_ptr(dev->tstats);
u64_stats_update_begin(&tstats->syncp); u64_stats_update_begin(&tstats->syncp);
- tstats->rx_packets += stats->node_stats.tx_packets; - tstats->rx_packets += stats->node_stats.tx_packets;
@ -234,7 +229,6 @@
u64_stats_update_end(&tstats->syncp); u64_stats_update_end(&tstats->syncp);
netdev_stats->rx_dropped += dropped; netdev_stats->rx_dropped += dropped;
dev_put(dev); dev_put(dev);
--- a/pvxlanmgr/nss_pvxlanmgr.c --- a/pvxlanmgr/nss_pvxlanmgr.c
+++ b/pvxlanmgr/nss_pvxlanmgr.c +++ b/pvxlanmgr/nss_pvxlanmgr.c
@@ -177,7 +177,7 @@ static struct rtnl_link_stats64 *nss_pvx @@ -177,7 +177,7 @@ static struct rtnl_link_stats64 *nss_pvx
@ -249,13 +243,12 @@
@@ -305,7 +305,7 @@ static void nss_pvxlanmgr_dummy_netdev_s @@ -305,7 +305,7 @@ static void nss_pvxlanmgr_dummy_netdev_s
dev->priv_destructor = NULL; dev->priv_destructor = NULL;
#endif #endif
- memcpy(dev->dev_addr, "\x00\x00\x00\x00\x00\x00", dev->addr_len); - memcpy(dev->dev_addr, "\x00\x00\x00\x00\x00\x00", dev->addr_len);
+ memcpy((void *) dev->dev_addr, "\x00\x00\x00\x00\x00\x00", dev->addr_len); + memcpy((void *) dev->dev_addr, "\x00\x00\x00\x00\x00\x00", dev->addr_len);
memset(dev->broadcast, 0xff, dev->addr_len); memset(dev->broadcast, 0xff, dev->addr_len);
memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
} }
--- a/clmapmgr/nss_clmapmgr.c --- a/clmapmgr/nss_clmapmgr.c
+++ b/clmapmgr/nss_clmapmgr.c +++ b/clmapmgr/nss_clmapmgr.c
@@ -103,7 +103,7 @@ static struct rtnl_link_stats64 *nss_clm @@ -103,7 +103,7 @@ static struct rtnl_link_stats64 *nss_clm
@ -267,7 +260,6 @@
priv = netdev_priv(dev); priv = netdev_priv(dev);
memset(stats, 0, sizeof(struct rtnl_link_stats64)); memset(stats, 0, sizeof(struct rtnl_link_stats64));
memcpy(stats, &priv->stats, sizeof(struct rtnl_link_stats64)); memcpy(stats, &priv->stats, sizeof(struct rtnl_link_stats64));
--- a/tls/nss_tlsmgr_tun.c --- a/tls/nss_tlsmgr_tun.c
+++ b/tls/nss_tlsmgr_tun.c +++ b/tls/nss_tlsmgr_tun.c
@@ -185,7 +185,7 @@ static void nss_tlsmgr_tun_setup(struct @@ -185,7 +185,7 @@ static void nss_tlsmgr_tun_setup(struct
@ -276,25 +268,24 @@
*/ */
- random_ether_addr(dev->dev_addr); - random_ether_addr(dev->dev_addr);
+ eth_random_addr((u8 *) dev->dev_addr); + eth_random_addr((u8 *) dev->dev_addr);
memset(dev->broadcast, 0xff, dev->addr_len); memset(dev->broadcast, 0xff, dev->addr_len);
memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
--- a/netlink/nss_nlgre_redir_cmn.c --- a/netlink/nss_nlgre_redir_cmn.c
+++ b/netlink/nss_nlgre_redir_cmn.c +++ b/netlink/nss_nlgre_redir_cmn.c
@@ -384,7 +384,7 @@ static int nss_nlgre_redir_cmn_set_mac_a @@ -384,7 +384,7 @@ static int nss_nlgre_redir_cmn_set_mac_a
return -EINVAL; return -EINVAL;
} }
- memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); - memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
+ memcpy((void *) dev->dev_addr, addr->sa_data, ETH_ALEN); + memcpy((void *) dev->dev_addr, addr->sa_data, ETH_ALEN);
return 0; return 0;
} }
--- a/nss_connmgr_tun6rd.c --- a/nss_connmgr_tun6rd.c
+++ b/nss_connmgr_tun6rd.c +++ b/nss_connmgr_tun6rd.c
@@ -101,10 +101,10 @@ static void nss_tun6rd_update_dev_stats( @@ -101,10 +101,10 @@ static void nss_tun6rd_update_dev_stats(
u64_stats_init(&stats.syncp); u64_stats_init(&stats.syncp);
u64_stats_update_begin(&stats.syncp); u64_stats_update_begin(&stats.syncp);
- stats.rx_packets = sync_stats->node_stats.rx_packets; - stats.rx_packets = sync_stats->node_stats.rx_packets;