qualcommax refresh kernel 6.6.44

lrhwind · Aug 7, 2024 · d9a836e · d9a836e
1 parent 77dec40
commit d9a836e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 24 deletions.
diff --git a/target/linux/qualcommax/patches-6.6/0600-1-qca-nss-ecm-support-CORE.patch b/target/linux/qualcommax/patches-6.6/0600-1-qca-nss-ecm-support-CORE.patch
@@ -610,7 +610,7 @@
  	return 0;
 
  out_remove_new_fa:
-@@ -1775,6 +1781,9 @@ int fib_table_delete(struct net *net, st
+@@ -1776,6 +1782,9 @@ int fib_table_delete(struct net *net, st
  	if (fa_to_delete->fa_state & FA_S_ACCESSED)
  		rt_cache_flush(cfg->fc_nlinfo.nl_net);
 
@@ -620,7 +620,7 @@
  	fib_release_info(fa_to_delete->fa_info);
  	alias_free_mem_rcu(fa_to_delete);
  	return 0;
-@@ -2407,6 +2416,20 @@ void __init fib_trie_init(void)
+@@ -2408,6 +2417,20 @@ void __init fib_trie_init(void)
  					   0, SLAB_PANIC | SLAB_ACCOUNT, NULL);
  }
 

diff --git a/target/linux/qualcommax/patches-6.6/0600-3-qca-nss-ecm-support-net-bonding.patch b/target/linux/qualcommax/patches-6.6/0600-3-qca-nss-ecm-support-net-bonding.patch
@@ -8,7 +8,7 @@
 
  static const struct flow_dissector_key flow_keys_bonding_keys[] = {
  	{
-@@ -5872,6 +5873,11 @@ static void bond_destructor(struct net_d
+@@ -5869,6 +5870,11 @@ static void bond_destructor(struct net_d
  	if (bond->wq)
  		destroy_workqueue(bond->wq);
 
@@ -20,7 +20,7 @@
  	free_percpu(bond->rr_tx_counter);
  }
 
-@@ -6421,6 +6427,13 @@ int bond_create(struct net *net, const c
+@@ -6418,6 +6424,13 @@ int bond_create(struct net *net, const c
 
  	bond_work_init_all(bond);
 

diff --git a/...ux/qualcommax/patches-6.6/0600-4-qca-nss-ecm-support-net-bonding-over-LAG-interface.patch b/...ux/qualcommax/patches-6.6/0600-4-qca-nss-ecm-support-net-bonding-over-LAG-interface.patch
@@ -227,7 +227,7 @@
  /**
   * bond_dev_queue_xmit - Prepare skb for xmit.
   *
-@@ -1189,6 +1204,23 @@ void bond_change_active_slave(struct bon
+@@ -1186,6 +1201,23 @@ void bond_change_active_slave(struct bon
  			if (BOND_MODE(bond) == BOND_MODE_8023AD)
  				bond_3ad_handle_link_change(new_active, BOND_LINK_UP);
 
@@ -251,15 +251,15 @@
  			if (bond_is_lb(bond))
  				bond_alb_handle_link_change(bond, new_active, BOND_LINK_UP);
  		} else {
-@@ -1833,6 +1865,7 @@ int bond_enslave(struct net_device *bond
+@@ -1830,6 +1862,7 @@ int bond_enslave(struct net_device *bond
  	const struct net_device_ops *slave_ops = slave_dev->netdev_ops;
  	struct slave *new_slave = NULL, *prev_slave;
  	struct sockaddr_storage ss;
 +	struct bond_cb *lag_cb_main; /* QCA NSS ECM bonding support */
  	int link_reporting;
  	int res = 0, i;
 
-@@ -2278,6 +2311,15 @@ int bond_enslave(struct net_device *bond
+@@ -2275,6 +2308,15 @@ int bond_enslave(struct net_device *bond
  		   bond_is_active_slave(new_slave) ? "an active" : "a backup",
  		   new_slave->link != BOND_LINK_DOWN ? "an up" : "a down");
 
@@ -275,7 +275,7 @@
  	/* enslave is successful */
  	bond_queue_slave_event(new_slave);
  	return 0;
-@@ -2343,6 +2385,15 @@ err_undo_flags:
+@@ -2340,6 +2382,15 @@ err_undo_flags:
  		}
  	}
 
@@ -291,15 +291,15 @@
  	return res;
  }
 
-@@ -2364,6 +2415,7 @@ static int __bond_release_one(struct net
+@@ -2361,6 +2412,7 @@ static int __bond_release_one(struct net
  	struct bonding *bond = netdev_priv(bond_dev);
  	struct slave *slave, *oldcurrent;
  	struct sockaddr_storage ss;
 +	struct bond_cb *lag_cb_main; /* QCA NSS ECM bonding support */
  	int old_flags = bond_dev->flags;
  	netdev_features_t old_features = bond_dev->features;
 
-@@ -2386,6 +2438,15 @@ static int __bond_release_one(struct net
+@@ -2383,6 +2435,15 @@ static int __bond_release_one(struct net
 
  	bond_set_slave_inactive_flags(slave, BOND_SLAVE_NOTIFY_NOW);
 
@@ -315,7 +315,7 @@
  	bond_sysfs_slave_del(slave);
 
  	/* recompute stats just before removing the slave */
-@@ -2708,6 +2769,8 @@ static void bond_miimon_commit(struct bo
+@@ -2705,6 +2766,8 @@ static void bond_miimon_commit(struct bo
  	struct slave *slave, *primary, *active;
  	bool do_failover = false;
  	struct list_head *iter;
@@ -324,7 +324,7 @@
 
  	ASSERT_RTNL();
 
-@@ -2747,6 +2810,12 @@ static void bond_miimon_commit(struct bo
+@@ -2744,6 +2807,12 @@ static void bond_miimon_commit(struct bo
  				bond_set_active_slave(slave);
  			}
 
@@ -337,7 +337,7 @@
  			slave_info(bond->dev, slave->dev, "link status definitely up, %u Mbps %s duplex\n",
  				   slave->speed == SPEED_UNKNOWN ? 0 : slave->speed,
  				   slave->duplex ? "full" : "half");
-@@ -2795,6 +2864,16 @@ static void bond_miimon_commit(struct bo
+@@ -2792,6 +2861,16 @@ static void bond_miimon_commit(struct bo
  		unblock_netpoll_tx();
  	}
 
@@ -354,7 +354,7 @@
  	bond_set_carrier(bond);
  }
 
-@@ -4047,8 +4126,219 @@ static inline u32 bond_eth_hash(struct s
+@@ -4044,8 +4123,219 @@ static inline u32 bond_eth_hash(struct s
  		return 0;
 
  	ep = (struct ethhdr *)(data + mhoff);
@@ -575,7 +575,7 @@
 
  static bool bond_flow_ip(struct sk_buff *skb, struct flow_keys *fk, const void *data,
  			 int hlen, __be16 l2_proto, int *nhoff, int *ip_proto, bool l34)
-@@ -5177,15 +5467,18 @@ static netdev_tx_t bond_3ad_xor_xmit(str
+@@ -5174,15 +5464,18 @@ static netdev_tx_t bond_3ad_xor_xmit(str
  				     struct net_device *dev)
  {
  	struct bonding *bond = netdev_priv(dev);
@@ -601,7 +601,7 @@
  }
 
  /* in broadcast mode, we send everything to all usable interfaces. */
-@@ -5435,8 +5728,9 @@ static netdev_tx_t __bond_start_xmit(str
+@@ -5432,8 +5725,9 @@ static netdev_tx_t __bond_start_xmit(str
  		return bond_xmit_roundrobin(skb, dev);
  	case BOND_MODE_ACTIVEBACKUP:
  		return bond_xmit_activebackup(skb, dev);

diff --git a/target/linux/qualcommax/patches-6.6/0605-1-qca-nss-cfi-support.patch b/target/linux/qualcommax/patches-6.6/0605-1-qca-nss-cfi-support.patch
@@ -33,15 +33,15 @@
  #include <linux/err.h>
  #include <linux/module.h>
  #include <net/ip.h>
-@@ -658,6 +659,7 @@ static int esp_output(struct xfrm_state
+@@ -657,6 +658,7 @@ static int esp_output(struct xfrm_state
  	struct ip_esp_hdr *esph;
  	struct crypto_aead *aead;
  	struct esp_info esp;
 +	bool nosupp_sg;
 
  	esp.inplace = true;
 
-@@ -669,6 +671,11 @@ static int esp_output(struct xfrm_state
+@@ -668,6 +670,11 @@ static int esp_output(struct xfrm_state
  	aead = x->data;
  	alen = crypto_aead_authsize(aead);
 
@@ -53,15 +53,15 @@
  	esp.tfclen = 0;
  	if (x->tfcpad) {
  		struct xfrm_dst *dst = (struct xfrm_dst *)skb_dst(skb);
-@@ -890,6 +897,7 @@ static int esp_input(struct xfrm_state *
+@@ -889,6 +896,7 @@ static int esp_input(struct xfrm_state *
  	u8 *iv;
  	struct scatterlist *sg;
  	int err = -EINVAL;
 +	bool nosupp_sg;
 
  	if (!pskb_may_pull(skb, sizeof(struct ip_esp_hdr) + ivlen))
  		goto out;
-@@ -897,6 +905,12 @@ static int esp_input(struct xfrm_state *
+@@ -896,6 +904,12 @@ static int esp_input(struct xfrm_state *
  	if (elen <= 0)
  		goto out;
 
@@ -84,15 +84,15 @@
  #include <linux/err.h>
  #include <linux/module.h>
  #include <net/ip.h>
-@@ -696,6 +697,7 @@ static int esp6_output(struct xfrm_state
+@@ -695,6 +696,7 @@ static int esp6_output(struct xfrm_state
  	struct ip_esp_hdr *esph;
  	struct crypto_aead *aead;
  	struct esp_info esp;
 +	bool nosupp_sg;
 
  	esp.inplace = true;
 
-@@ -707,6 +709,11 @@ static int esp6_output(struct xfrm_state
+@@ -706,6 +708,11 @@ static int esp6_output(struct xfrm_state
  	aead = x->data;
  	alen = crypto_aead_authsize(aead);
 
@@ -104,15 +104,15 @@
  	esp.tfclen = 0;
  	if (x->tfcpad) {
  		struct xfrm_dst *dst = (struct xfrm_dst *)skb_dst(skb);
-@@ -934,6 +941,7 @@ static int esp6_input(struct xfrm_state
+@@ -933,6 +940,7 @@ static int esp6_input(struct xfrm_state
  	__be32 *seqhi;
  	u8 *iv;
  	struct scatterlist *sg;
 +	bool nosupp_sg;
 
  	if (!pskb_may_pull(skb, sizeof(struct ip_esp_hdr) + ivlen)) {
  		ret = -EINVAL;
-@@ -945,6 +953,12 @@ static int esp6_input(struct xfrm_state
+@@ -944,6 +952,12 @@ static int esp6_input(struct xfrm_state
  		goto out;
  	}