diff --git a/target/linux/ipq806x/patches-5.15/999-102-qca-nss-ecm-add-pppoe-offload.patch b/target/linux/ipq806x/patches-5.15/999-102-qca-nss-ecm-add-pppoe-offload.patch index 9bb9ba089c..378d273039 100644 --- a/target/linux/ipq806x/patches-5.15/999-102-qca-nss-ecm-add-pppoe-offload.patch +++ b/target/linux/ipq806x/patches-5.15/999-102-qca-nss-ecm-add-pppoe-offload.patch @@ -22,7 +22,7 @@ Subject: [PATCH] Update 602-qca-add-pppoe-offload-support.patch for kernel #include #include -@@ -253,6 +254,25 @@ struct ppp_net { +@@ -254,6 +255,25 @@ struct ppp_net { #define seq_before(a, b) ((s32)((a) - (b)) < 0) #define seq_after(a, b) ((s32)((a) - (b)) > 0) @@ -48,7 +48,7 @@ Subject: [PATCH] Update 602-qca-add-pppoe-offload-support.patch for kernel /* Prototypes. */ static int ppp_unattached_ioctl(struct net *net, struct ppp_file *pf, struct file *file, unsigned int cmd, unsigned long arg); -@@ -3452,7 +3472,10 @@ ppp_connect_channel(struct channel *pch, +@@ -3467,7 +3487,10 @@ ppp_connect_channel(struct channel *pch, struct ppp_net *pn; int ret = -ENXIO; int hdrlen; @@ -59,7 +59,7 @@ Subject: [PATCH] Update 602-qca-add-pppoe-offload-support.patch for kernel pn = ppp_pernet(pch->chan_net); mutex_lock(&pn->all_ppp_mutex); -@@ -3484,13 +3507,40 @@ ppp_connect_channel(struct channel *pch, +@@ -3499,13 +3522,40 @@ ppp_connect_channel(struct channel *pch, ++ppp->n_channels; pch->ppp = ppp; refcount_inc(&ppp->file.refcnt); @@ -101,7 +101,7 @@ Subject: [PATCH] Update 602-qca-add-pppoe-offload-support.patch for kernel return ret; } -@@ -3508,6 +3558,13 @@ ppp_disconnect_channel(struct channel *p +@@ -3523,6 +3573,13 @@ ppp_disconnect_channel(struct channel *p pch->ppp = NULL; write_unlock_bh(&pch->upl); if (ppp) { @@ -115,7 +115,7 @@ Subject: [PATCH] Update 602-qca-add-pppoe-offload-support.patch for kernel /* remove it from the ppp unit's list */ ppp_lock(ppp); list_del(&pch->clist); -@@ -3587,6 +3644,222 @@ static void *unit_find(struct idr *p, in +@@ -3602,6 +3659,222 @@ static void *unit_find(struct idr *p, in return idr_find(p, n); } @@ -338,7 +338,7 @@ Subject: [PATCH] Update 602-qca-add-pppoe-offload-support.patch for kernel /* Module/initialization stuff */ module_init(ppp_init); -@@ -3603,6 +3876,7 @@ EXPORT_SYMBOL(ppp_input_error); +@@ -3618,6 +3891,7 @@ EXPORT_SYMBOL(ppp_input_error); EXPORT_SYMBOL(ppp_output_wakeup); EXPORT_SYMBOL(ppp_register_compressor); EXPORT_SYMBOL(ppp_unregister_compressor); diff --git a/target/linux/ipq806x/patches-5.15/999-203-qca-nss-clients-ppptp-support.patch b/target/linux/ipq806x/patches-5.15/999-203-qca-nss-clients-ppptp-support.patch index 47fe5ac0f2..2869d3ac14 100644 --- a/target/linux/ipq806x/patches-5.15/999-203-qca-nss-clients-ppptp-support.patch +++ b/target/linux/ipq806x/patches-5.15/999-203-qca-nss-clients-ppptp-support.patch @@ -51,7 +51,7 @@ #endif /* !(__LINUX_IF_PPPOX_H) */ --- a/drivers/net/ppp/ppp_generic.c +++ b/drivers/net/ppp/ppp_generic.c -@@ -2972,6 +2972,20 @@ char *ppp_dev_name(struct ppp_channel *c +@@ -2987,6 +2987,20 @@ char *ppp_dev_name(struct ppp_channel *c return name; } @@ -72,7 +72,7 @@ /* * Disconnect a channel from the generic layer. -@@ -3680,6 +3694,28 @@ void ppp_update_stats(struct net_device +@@ -3695,6 +3709,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. */ -@@ -3871,6 +3907,7 @@ EXPORT_SYMBOL(ppp_unregister_channel); +@@ -3886,6 +3922,7 @@ EXPORT_SYMBOL(ppp_unregister_channel); EXPORT_SYMBOL(ppp_channel_index); EXPORT_SYMBOL(ppp_unit_number); EXPORT_SYMBOL(ppp_dev_name); diff --git a/target/linux/ipq806x/patches-5.15/999-206-qca-nss-clients-l2tp-offloading-support.patch b/target/linux/ipq806x/patches-5.15/999-206-qca-nss-clients-l2tp-offloading-support.patch index 61e268cc23..d00bf60a39 100644 --- a/target/linux/ipq806x/patches-5.15/999-206-qca-nss-clients-l2tp-offloading-support.patch +++ b/target/linux/ipq806x/patches-5.15/999-206-qca-nss-clients-l2tp-offloading-support.patch @@ -261,7 +261,7 @@ --- a/drivers/net/ppp/ppp_generic.c +++ b/drivers/net/ppp/ppp_generic.c -@@ -3742,6 +3742,32 @@ int ppp_is_multilink(struct net_device * +@@ -3757,6 +3757,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 -@@ -3880,6 +3906,59 @@ int ppp_hold_channels(struct net_device +@@ -3895,6 +3921,59 @@ int ppp_hold_channels(struct net_device } EXPORT_SYMBOL(ppp_hold_channels); diff --git a/target/linux/ipq806x/patches-5.15/999-800-qca-nss-ecm-12.1-drop-unused.patch b/target/linux/ipq806x/patches-5.15/999-800-qca-nss-ecm-12.1-drop-unused.patch index ff604badee..b6b2d6b9b8 100644 --- a/target/linux/ipq806x/patches-5.15/999-800-qca-nss-ecm-12.1-drop-unused.patch +++ b/target/linux/ipq806x/patches-5.15/999-800-qca-nss-ecm-12.1-drop-unused.patch @@ -39,7 +39,7 @@ { --- a/drivers/net/ppp/ppp_generic.c +++ b/drivers/net/ppp/ppp_generic.c -@@ -3800,34 +3800,6 @@ int ppp_channel_get_proto_version(struct +@@ -3815,34 +3815,6 @@ int ppp_channel_get_proto_version(struct } EXPORT_SYMBOL(ppp_channel_get_proto_version);