kernel: ipq806x: refresh qca-nss patches to kernel 5.15.167

This commit is contained in:
Lucas Asvio
2024-09-13 13:35:49 +02:00
parent c322f107e6
commit 526c200987
7 changed files with 19 additions and 19 deletions

View File

@@ -155,7 +155,7 @@
void fib_del_ifaddr(struct in_ifaddr *, struct in_ifaddr *);
--- a/net/8021q/vlan_core.c
+++ b/net/8021q/vlan_core.c
@@ -563,4 +563,12 @@ static int __init vlan_offload_init(void
@@ -558,4 +558,12 @@ static int __init vlan_offload_init(void
return 0;
}
@@ -270,7 +270,7 @@
if (swdev_notify)
br_switchdev_fdb_notify(br, fdb, type);
@@ -1377,3 +1439,62 @@ void br_fdb_clear_offload(const struct n
@@ -1375,3 +1437,62 @@ void br_fdb_clear_offload(const struct n
spin_unlock_bh(&p->br->hash_lock);
}
EXPORT_SYMBOL_GPL(br_fdb_clear_offload);
@@ -602,7 +602,7 @@
static void
ipv6_link_dev_addr(struct inet6_dev *idev, struct inet6_ifaddr *ifp)
@@ -2065,6 +2066,7 @@ struct inet6_ifaddr *ipv6_get_ifaddr(str
@@ -2066,6 +2067,7 @@ struct inet6_ifaddr *ipv6_get_ifaddr(str
return result;
}
@@ -612,7 +612,7 @@
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -650,6 +650,7 @@ void ndisc_send_ns(struct net_device *de
@@ -652,6 +652,7 @@ void ndisc_send_ns(struct net_device *de
ndisc_send_skb(skb, daddr, saddr);
}

View File

@@ -10,7 +10,7 @@
static struct flow_dissector flow_keys_bonding __read_mostly;
/*-------------------------- Forward declarations ---------------------------*/
@@ -4115,6 +4118,23 @@ static int bond_get_lowest_level_rcu(str
@@ -4107,6 +4110,23 @@ static int bond_get_lowest_level_rcu(str
}
#endif
@@ -34,7 +34,7 @@
static void bond_get_stats(struct net_device *bond_dev,
struct rtnl_link_stats64 *stats)
{
@@ -5447,6 +5467,10 @@ static void bond_destructor(struct net_d
@@ -5439,6 +5459,10 @@ static void bond_destructor(struct net_d
if (bond->rr_tx_counter)
free_percpu(bond->rr_tx_counter);
@@ -45,7 +45,7 @@
}
void bond_setup(struct net_device *bond_dev)
@@ -6020,7 +6044,14 @@ int bond_create(struct net *net, const c
@@ -6012,7 +6036,14 @@ int bond_create(struct net *net, const c
bond_work_init_all(bond);

View File

@@ -1,6 +1,6 @@
--- a/net/l2tp/l2tp_core.c
+++ b/net/l2tp/l2tp_core.c
@@ -398,6 +398,31 @@ err_tlock:
@@ -403,6 +403,31 @@ err_tlock:
}
EXPORT_SYMBOL_GPL(l2tp_session_register);

View File

@@ -22,7 +22,7 @@
#endif /* __NET_IP_TUNNELS_H */
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -2440,6 +2440,26 @@ nla_put_failure:
@@ -2442,6 +2442,26 @@ nla_put_failure:
return -EMSGSIZE;
}

View File

@@ -1,6 +1,6 @@
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -2446,7 +2446,7 @@ nla_put_failure:
@@ -2448,7 +2448,7 @@ nla_put_failure:
*/
void ip6_update_offload_stats(struct net_device *dev, void *ptr)
{

View File

@@ -25,7 +25,7 @@
* flag unset if they can't handle memory allocation failures.
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -659,6 +659,7 @@ static int esp_output(struct xfrm_state
@@ -658,6 +658,7 @@ static int esp_output(struct xfrm_state
struct ip_esp_hdr *esph;
struct crypto_aead *aead;
struct esp_info esp;
@@ -33,7 +33,7 @@
esp.inplace = true;
@@ -670,6 +671,11 @@ static int esp_output(struct xfrm_state
@@ -669,6 +670,11 @@ static int esp_output(struct xfrm_state
aead = x->data;
alen = crypto_aead_authsize(aead);
@@ -45,7 +45,7 @@
esp.tfclen = 0;
if (x->tfcpad) {
struct xfrm_dst *dst = (struct xfrm_dst *)skb_dst(skb);
@@ -897,6 +903,7 @@ static int esp_input(struct xfrm_state *
@@ -896,6 +902,7 @@ static int esp_input(struct xfrm_state *
u8 *iv;
struct scatterlist *sg;
int err = -EINVAL;
@@ -53,7 +53,7 @@
if (!pskb_may_pull(skb, sizeof(struct ip_esp_hdr) + ivlen))
goto out;
@@ -904,6 +911,12 @@ static int esp_input(struct xfrm_state *
@@ -903,6 +910,12 @@ static int esp_input(struct xfrm_state *
if (elen <= 0)
goto out;
@@ -68,7 +68,7 @@
--- a/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -696,6 +696,7 @@ static int esp6_output(struct xfrm_state
@@ -695,6 +695,7 @@ static int esp6_output(struct xfrm_state
struct ip_esp_hdr *esph;
struct crypto_aead *aead;
struct esp_info esp;
@@ -76,7 +76,7 @@
esp.inplace = true;
@@ -707,6 +708,11 @@ static int esp6_output(struct xfrm_state
@@ -706,6 +707,11 @@ static int esp6_output(struct xfrm_state
aead = x->data;
alen = crypto_aead_authsize(aead);
@@ -88,7 +88,7 @@
esp.tfclen = 0;
if (x->tfcpad) {
struct xfrm_dst *dst = (struct xfrm_dst *)skb_dst(skb);
@@ -940,6 +946,7 @@ static int esp6_input(struct xfrm_state
@@ -939,6 +945,7 @@ static int esp6_input(struct xfrm_state
__be32 *seqhi;
u8 *iv;
struct scatterlist *sg;
@@ -96,7 +96,7 @@
if (!pskb_may_pull(skb, sizeof(struct ip_esp_hdr) + ivlen)) {
ret = -EINVAL;
@@ -951,6 +958,12 @@ static int esp6_input(struct xfrm_state
@@ -950,6 +957,12 @@ static int esp6_input(struct xfrm_state
goto out;
}

View File

@@ -10,7 +10,7 @@
const char *addr,
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -1460,26 +1460,6 @@ void br_fdb_clear_offload(const struct n
@@ -1458,26 +1458,6 @@ void br_fdb_clear_offload(const struct n
EXPORT_SYMBOL_GPL(br_fdb_clear_offload);
/* QCA NSS ECM support - Start */