qualcommax: NSS: Refresh patches against 6.6.41

Signed-off-by: Sean Khan <datapronix@protonmail.com>
This commit is contained in:
Sean Khan 2024-07-22 18:49:04 -04:00
parent c867de9529
commit 2027830ef7
5 changed files with 13 additions and 57 deletions

View File

@ -8,7 +8,7 @@
#include <linux/nsproxy.h>
#include <net/net_namespace.h>
@@ -254,6 +255,25 @@ struct ppp_net {
@@ -255,6 +256,25 @@ struct ppp_net {
#define seq_before(a, b) ((s32)((a) - (b)) < 0)
#define seq_after(a, b) ((s32)((a) - (b)) > 0)
@ -34,7 +34,7 @@
/* Prototypes. */
static int ppp_unattached_ioctl(struct net *net, struct ppp_file *pf,
struct file *file, unsigned int cmd, unsigned long arg);
@@ -3453,7 +3473,10 @@ ppp_connect_channel(struct channel *pch,
@@ -3468,7 +3488,10 @@ ppp_connect_channel(struct channel *pch,
struct ppp_net *pn;
int ret = -ENXIO;
int hdrlen;
@ -45,7 +45,7 @@
pn = ppp_pernet(pch->chan_net);
mutex_lock(&pn->all_ppp_mutex);
@@ -3485,13 +3508,40 @@ ppp_connect_channel(struct channel *pch,
@@ -3500,13 +3523,40 @@ ppp_connect_channel(struct channel *pch,
++ppp->n_channels;
pch->ppp = ppp;
refcount_inc(&ppp->file.refcnt);
@ -87,7 +87,7 @@
return ret;
}
@@ -3509,6 +3559,13 @@ ppp_disconnect_channel(struct channel *p
@@ -3524,6 +3574,13 @@ ppp_disconnect_channel(struct channel *p
pch->ppp = NULL;
write_unlock_bh(&pch->upl);
if (ppp) {
@ -101,7 +101,7 @@
/* remove it from the ppp unit's list */
ppp_lock(ppp);
list_del(&pch->clist);
@@ -3588,6 +3645,222 @@ static void *unit_find(struct idr *p, in
@@ -3603,6 +3660,222 @@ static void *unit_find(struct idr *p, in
return idr_find(p, n);
}
@ -324,7 +324,7 @@
/* Module/initialization stuff */
module_init(ppp_init);
@@ -3604,6 +3877,7 @@ EXPORT_SYMBOL(ppp_input_error);
@@ -3619,6 +3892,7 @@ EXPORT_SYMBOL(ppp_input_error);
EXPORT_SYMBOL(ppp_output_wakeup);
EXPORT_SYMBOL(ppp_register_compressor);
EXPORT_SYMBOL(ppp_unregister_compressor);

View File

@ -51,7 +51,7 @@
#endif /* !(__LINUX_IF_PPPOX_H) */
--- a/drivers/net/ppp/ppp_generic.c
+++ b/drivers/net/ppp/ppp_generic.c
@@ -2973,6 +2973,20 @@ char *ppp_dev_name(struct ppp_channel *c
@@ -2988,6 +2988,20 @@ char *ppp_dev_name(struct ppp_channel *c
return name;
}
@ -72,7 +72,7 @@
/*
* Disconnect a channel from the generic layer.
@@ -3681,6 +3695,28 @@ void ppp_update_stats(struct net_device
@@ -3696,6 +3710,28 @@ void ppp_update_stats(struct net_device
ppp_recv_unlock(ppp);
}
@ -101,7 +101,7 @@
/* Returns >0 if the device is a multilink PPP netdevice, 0 if not or < 0 if
* the device is not PPP.
*/
@@ -3872,6 +3908,7 @@ EXPORT_SYMBOL(ppp_unregister_channel);
@@ -3887,6 +3923,7 @@ EXPORT_SYMBOL(ppp_unregister_channel);
EXPORT_SYMBOL(ppp_channel_index);
EXPORT_SYMBOL(ppp_unit_number);
EXPORT_SYMBOL(ppp_dev_name);

View File

@ -261,7 +261,7 @@
--- a/drivers/net/ppp/ppp_generic.c
+++ b/drivers/net/ppp/ppp_generic.c
@@ -3743,6 +3743,32 @@ int ppp_is_multilink(struct net_device *
@@ -3758,6 +3758,32 @@ int ppp_is_multilink(struct net_device *
}
EXPORT_SYMBOL(ppp_is_multilink);
@ -294,7 +294,7 @@
/* ppp_channel_get_protocol()
* Call this to obtain the underlying protocol of the PPP channel,
* e.g. PX_PROTO_OE
@@ -3881,6 +3907,59 @@ int ppp_hold_channels(struct net_device
@@ -3896,6 +3922,59 @@ int ppp_hold_channels(struct net_device
}
EXPORT_SYMBOL(ppp_hold_channels);

View File

@ -350,7 +350,7 @@
+ else if (likely(!atomic_dec_and_test(&skb->users)))
+ return;
+ */
+
+ /* If possible we'd like to recycle any skb rather than just free it,
+ * but in order to do that we need to release any head state too.
+ * We don't want to do this later because we'll be in a pre-emption
@ -364,7 +364,7 @@
+ */
+ if (likely(skb->head) && likely(skb_recycler_consume(skb)))
+ return;
+
+#ifdef CONFIG_TRACEPOINTS
trace_consume_skb(skb, __builtin_return_address(0));
- __kfree_skb(skb);

View File

@ -1,5 +1,3 @@
diff --git a/arch/arm64/boot/dts/qcom/ipq6010-wax214.dts b/arch/arm64/boot/dts/qcom/ipq6010-wax214.dts
index 90a4828c17..bb13f6fb4a 100644
--- a/arch/arm64/boot/dts/qcom/ipq6010-wax214.dts
+++ b/arch/arm64/boot/dts/qcom/ipq6010-wax214.dts
@@ -25,7 +25,7 @@
@ -11,8 +9,6 @@ index 90a4828c17..bb13f6fb4a 100644
};
keys {
diff --git a/arch/arm64/boot/dts/qcom/ipq6018-fap650.dts b/arch/arm64/boot/dts/qcom/ipq6018-fap650.dts
index e9ebcc9063..7420dc75dc 100644
--- a/arch/arm64/boot/dts/qcom/ipq6018-fap650.dts
+++ b/arch/arm64/boot/dts/qcom/ipq6018-fap650.dts
@@ -30,7 +30,7 @@
@ -24,8 +20,6 @@ index e9ebcc9063..7420dc75dc 100644
};
keys {
diff --git a/arch/arm64/boot/dts/qcom/ipq8070-cax1800.dts b/arch/arm64/boot/dts/qcom/ipq8070-cax1800.dts
index 4359c3d5b1..8ca6eb6dac 100644
--- a/arch/arm64/boot/dts/qcom/ipq8070-cax1800.dts
+++ b/arch/arm64/boot/dts/qcom/ipq8070-cax1800.dts
@@ -27,7 +27,7 @@
@ -37,8 +31,6 @@ index 4359c3d5b1..8ca6eb6dac 100644
};
keys {
diff --git a/arch/arm64/boot/dts/qcom/ipq8070-rm2-6.dts b/arch/arm64/boot/dts/qcom/ipq8070-rm2-6.dts
index 52a9468f99..7ba0bda97c 100644
--- a/arch/arm64/boot/dts/qcom/ipq8070-rm2-6.dts
+++ b/arch/arm64/boot/dts/qcom/ipq8070-rm2-6.dts
@@ -33,7 +33,7 @@
@ -50,8 +42,6 @@ index 52a9468f99..7ba0bda97c 100644
};
keys {
diff --git a/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dtsi b/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dtsi
index c2c5f4ce83..f198df9183 100644
--- a/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dtsi
@@ -20,7 +20,7 @@
@ -63,8 +53,6 @@ index c2c5f4ce83..f198df9183 100644
};
keys {
diff --git a/arch/arm64/boot/dts/qcom/ipq8071-eap102.dts b/arch/arm64/boot/dts/qcom/ipq8071-eap102.dts
index bcf0285220..760a00fc7f 100644
--- a/arch/arm64/boot/dts/qcom/ipq8071-eap102.dts
+++ b/arch/arm64/boot/dts/qcom/ipq8071-eap102.dts
@@ -30,7 +30,7 @@
@ -76,8 +64,6 @@ index bcf0285220..760a00fc7f 100644
};
keys {
diff --git a/arch/arm64/boot/dts/qcom/ipq8071-mf269.dts b/arch/arm64/boot/dts/qcom/ipq8071-mf269.dts
index c5b21bd29a..3ff700fe63 100644
--- a/arch/arm64/boot/dts/qcom/ipq8071-mf269.dts
+++ b/arch/arm64/boot/dts/qcom/ipq8071-mf269.dts
@@ -25,7 +25,7 @@
@ -89,8 +75,6 @@ index c5b21bd29a..3ff700fe63 100644
};
keys {
diff --git a/arch/arm64/boot/dts/qcom/ipq8072-aw1000.dts b/arch/arm64/boot/dts/qcom/ipq8072-aw1000.dts
index fbad0e79e5..28b5bc3506 100644
--- a/arch/arm64/boot/dts/qcom/ipq8072-aw1000.dts
+++ b/arch/arm64/boot/dts/qcom/ipq8072-aw1000.dts
@@ -35,7 +35,7 @@
@ -102,8 +86,6 @@ index fbad0e79e5..28b5bc3506 100644
};
gpio-export {
diff --git a/arch/arm64/boot/dts/qcom/ipq8072-ax880.dts b/arch/arm64/boot/dts/qcom/ipq8072-ax880.dts
index af5a497b39..3510705344 100644
--- a/arch/arm64/boot/dts/qcom/ipq8072-ax880.dts
+++ b/arch/arm64/boot/dts/qcom/ipq8072-ax880.dts
@@ -30,7 +30,7 @@
@ -115,8 +97,6 @@ index af5a497b39..3510705344 100644
};
keys {
diff --git a/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts b/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts
index fe5a136722..b555b9e6d5 100644
--- a/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts
+++ b/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts
@@ -26,7 +26,7 @@
@ -128,8 +108,6 @@ index fe5a136722..b555b9e6d5 100644
};
keys {
diff --git a/arch/arm64/boot/dts/qcom/ipq8072-dl-wrx36.dts b/arch/arm64/boot/dts/qcom/ipq8072-dl-wrx36.dts
index 24dd51b47f..8096807d3a 100644
--- a/arch/arm64/boot/dts/qcom/ipq8072-dl-wrx36.dts
+++ b/arch/arm64/boot/dts/qcom/ipq8072-dl-wrx36.dts
@@ -32,7 +32,7 @@
@ -141,8 +119,6 @@ index 24dd51b47f..8096807d3a 100644
};
keys {
diff --git a/arch/arm64/boot/dts/qcom/ipq8072-mx5300.dts b/arch/arm64/boot/dts/qcom/ipq8072-mx5300.dts
index 6e2e95c00a..02106cf753 100644
--- a/arch/arm64/boot/dts/qcom/ipq8072-mx5300.dts
+++ b/arch/arm64/boot/dts/qcom/ipq8072-mx5300.dts
@@ -33,7 +33,7 @@
@ -154,8 +130,6 @@ index 6e2e95c00a..02106cf753 100644
};
keys {
diff --git a/arch/arm64/boot/dts/qcom/ipq8072-mx8500.dts b/arch/arm64/boot/dts/qcom/ipq8072-mx8500.dts
index a4fcb3e18d..075faf8f12 100644
--- a/arch/arm64/boot/dts/qcom/ipq8072-mx8500.dts
+++ b/arch/arm64/boot/dts/qcom/ipq8072-mx8500.dts
@@ -25,7 +25,7 @@
@ -167,8 +141,6 @@ index a4fcb3e18d..075faf8f12 100644
};
gpio_export {
diff --git a/arch/arm64/boot/dts/qcom/ipq8072-wax218.dts b/arch/arm64/boot/dts/qcom/ipq8072-wax218.dts
index 2c1e0f5e47..2354aff1bb 100644
--- a/arch/arm64/boot/dts/qcom/ipq8072-wax218.dts
+++ b/arch/arm64/boot/dts/qcom/ipq8072-wax218.dts
@@ -27,7 +27,7 @@
@ -180,8 +152,6 @@ index 2c1e0f5e47..2354aff1bb 100644
};
keys {
diff --git a/arch/arm64/boot/dts/qcom/ipq8072-wax620.dts b/arch/arm64/boot/dts/qcom/ipq8072-wax620.dts
index 5762899889..32b84c7560 100644
--- a/arch/arm64/boot/dts/qcom/ipq8072-wax620.dts
+++ b/arch/arm64/boot/dts/qcom/ipq8072-wax620.dts
@@ -30,7 +30,7 @@
@ -193,8 +163,6 @@ index 5762899889..32b84c7560 100644
};
keys {
diff --git a/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts b/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts
index ebc68e15a8..d6690d1b66 100644
--- a/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts
+++ b/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts
@@ -31,7 +31,7 @@
@ -206,8 +174,6 @@ index ebc68e15a8..d6690d1b66 100644
};
keys {
diff --git a/arch/arm64/boot/dts/qcom/ipq8072-zbt-z800ax.dts b/arch/arm64/boot/dts/qcom/ipq8072-zbt-z800ax.dts
index 2398bf9295..99b746245e 100644
--- a/arch/arm64/boot/dts/qcom/ipq8072-zbt-z800ax.dts
+++ b/arch/arm64/boot/dts/qcom/ipq8072-zbt-z800ax.dts
@@ -33,7 +33,7 @@
@ -219,8 +185,6 @@ index 2398bf9295..99b746245e 100644
};
gpio-export {
diff --git a/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts b/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts
index 5331f98587..57e0bde3cb 100644
--- a/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts
+++ b/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts
@@ -25,7 +25,7 @@
@ -232,8 +196,6 @@ index 5331f98587..57e0bde3cb 100644
};
keys {
diff --git a/arch/arm64/boot/dts/qcom/ipq8074-sxk80.dtsi b/arch/arm64/boot/dts/qcom/ipq8074-sxk80.dtsi
index 7a29f945d5..315472635b 100644
--- a/arch/arm64/boot/dts/qcom/ipq8074-sxk80.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq8074-sxk80.dtsi
@@ -26,7 +26,7 @@
@ -245,8 +207,6 @@ index 7a29f945d5..315472635b 100644
};
keys {
diff --git a/arch/arm64/boot/dts/qcom/ipq8074-wax630.dts b/arch/arm64/boot/dts/qcom/ipq8074-wax630.dts
index d241ae642a..bb400beb0f 100644
--- a/arch/arm64/boot/dts/qcom/ipq8074-wax630.dts
+++ b/arch/arm64/boot/dts/qcom/ipq8074-wax630.dts
@@ -29,7 +29,7 @@
@ -258,8 +218,6 @@ index d241ae642a..bb400beb0f 100644
};
keys {
diff --git a/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts b/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts
index 5f463b6c62..52d9f9c4e9 100644
--- a/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts
+++ b/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts
@@ -25,7 +25,7 @@
@ -271,8 +229,6 @@ index 5f463b6c62..52d9f9c4e9 100644
};
leds {
diff --git a/arch/arm64/boot/dts/qcom/ipq8174-mx4200.dtsi b/arch/arm64/boot/dts/qcom/ipq8174-mx4200.dtsi
index 741c00bdcb..a4a379bb4a 100644
--- a/arch/arm64/boot/dts/qcom/ipq8174-mx4200.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq8174-mx4200.dtsi
@@ -30,7 +30,7 @@