kernel: ipq806x: refresh qca-nss patches to kernel 5.15.178
This commit is contained in:
@@ -34,7 +34,7 @@
|
|||||||
qs->attr.machine = socinfo_machine(&pdev->dev,
|
qs->attr.machine = socinfo_machine(&pdev->dev,
|
||||||
le32_to_cpu(info->id));
|
le32_to_cpu(info->id));
|
||||||
qs->attr.soc_id = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%u",
|
qs->attr.soc_id = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%u",
|
||||||
@@ -623,6 +626,9 @@ static int qcom_socinfo_probe(struct pla
|
@@ -629,6 +632,9 @@ static int qcom_socinfo_probe(struct pla
|
||||||
if (IS_ERR(qs->soc_dev))
|
if (IS_ERR(qs->soc_dev))
|
||||||
return PTR_ERR(qs->soc_dev);
|
return PTR_ERR(qs->soc_dev);
|
||||||
|
|
||||||
|
|||||||
@@ -91,7 +91,7 @@
|
|||||||
depends on NETFILTER_ADVANCED
|
depends on NETFILTER_ADVANCED
|
||||||
--- a/net/netfilter/nf_conntrack_core.c
|
--- a/net/netfilter/nf_conntrack_core.c
|
||||||
+++ b/net/netfilter/nf_conntrack_core.c
|
+++ b/net/netfilter/nf_conntrack_core.c
|
||||||
@@ -2899,6 +2899,9 @@ int nf_conntrack_init_net(struct net *ne
|
@@ -2902,6 +2902,9 @@ int nf_conntrack_init_net(struct net *ne
|
||||||
nf_conntrack_ecache_pernet_init(net);
|
nf_conntrack_ecache_pernet_init(net);
|
||||||
nf_conntrack_helper_pernet_init(net);
|
nf_conntrack_helper_pernet_init(net);
|
||||||
nf_conntrack_proto_pernet_init(net);
|
nf_conntrack_proto_pernet_init(net);
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
static struct flow_dissector flow_keys_bonding __read_mostly;
|
static struct flow_dissector flow_keys_bonding __read_mostly;
|
||||||
|
|
||||||
/*-------------------------- Forward declarations ---------------------------*/
|
/*-------------------------- Forward declarations ---------------------------*/
|
||||||
@@ -4107,6 +4110,23 @@ static int bond_get_lowest_level_rcu(str
|
@@ -4108,6 +4111,23 @@ static int bond_get_lowest_level_rcu(str
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -34,7 +34,7 @@
|
|||||||
static void bond_get_stats(struct net_device *bond_dev,
|
static void bond_get_stats(struct net_device *bond_dev,
|
||||||
struct rtnl_link_stats64 *stats)
|
struct rtnl_link_stats64 *stats)
|
||||||
{
|
{
|
||||||
@@ -5439,6 +5459,10 @@ static void bond_destructor(struct net_d
|
@@ -5440,6 +5460,10 @@ static void bond_destructor(struct net_d
|
||||||
|
|
||||||
if (bond->rr_tx_counter)
|
if (bond->rr_tx_counter)
|
||||||
free_percpu(bond->rr_tx_counter);
|
free_percpu(bond->rr_tx_counter);
|
||||||
@@ -45,7 +45,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
void bond_setup(struct net_device *bond_dev)
|
void bond_setup(struct net_device *bond_dev)
|
||||||
@@ -6012,7 +6036,14 @@ int bond_create(struct net *net, const c
|
@@ -6013,7 +6037,14 @@ int bond_create(struct net *net, const c
|
||||||
|
|
||||||
bond_work_init_all(bond);
|
bond_work_init_all(bond);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user