him411/nss-packages-LiBwrt
1
0
Fork 0
mirror of https://github.com/LiBwrt/nss-packages.git synced 2025-12-16 17:15:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix qmi_wwan for kernel 6.12

Browse Source
This commit is contained in:
ZqinKing 2025-04-07 13:27:24 +00:00
parent 6788437841
commit 73164ad71b
3 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wwan/driver/quectel_QMI_WWAN/Makefile
View File

@ -37,7 +37,7 @@ EXTRA_CFLAGS+= \
MAKE_OPTS:= \
ARCH="$(LINUX_KARCH)" \
CROSS_COMPILE="$(TARGET_CROSS)" \
EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
EXTRA_CFLAGS="$(EXTRA_CFLAGS) -Wno-missing-declarations -Wno-missing-prototypes" \
CXXFLAGS="$(TARGET_CXXFLAGS)" \
M="$(PKG_BUILD_DIR)" \
$(EXTRA_KCONFIG)

4
wwan/driver/quectel_QMI_WWAN/patches/100-kernel-6.6.patch
View File

@ -9,7 +9,7 @@
#define CONFIG_QCA_NSS_DRV
//#define CONFIG_QCA_NSS_PACKET_FILTER
#endif
@@ -846,12 +846,20 @@ static struct rtnl_link_stats64 *_rmnet_
@@ -847,12 +847,20 @@ static struct rtnl_link_stats64 *_rmnet_
stats64 = per_cpu_ptr(dev->stats64, cpu);
do {
@ -30,7 +30,7 @@
stats->rx_packets += u64_stats_read(&rx_packets);
stats->rx_bytes += u64_stats_read(&rx_bytes);
@@ -2588,7 +2585,6 @@ static void qmap_qmi_wwan_disconnect(str
@@ -2644,7 +2652,6 @@ static void qmap_qmi_wwan_disconnect(str
static struct usb_driver qmi_wwan_driver = {
.name = "qmi_wwan_q",
.id_table = products,

26
wwan/driver/quectel_QMI_WWAN/patches/101-kernel-6.12.patch Normal file
View File

@ -0,0 +1,26 @@
--- a/rmnet_nss.c
+++ b/rmnet_nss.c
@@ -259,7 +259,9 @@ static int rmnet_nss_adjust_header(struc
/* subtract to account for skb_push */
skb->len -= bytes;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 12, 0))
+ frag->offset += bytes;
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0))
frag->bv_offset += bytes;
#else
frag->page_offset += bytes;
--- a/qmi_wwan_q.c
+++ b/qmi_wwan_q.c
@@ -2007,8 +2007,8 @@ static void ql_net_get_drvinfo(struct ne
{
/* Inherit standard device info */
usbnet_get_drvinfo(net, info);
- strlcpy(info->driver, driver_name, sizeof(info->driver));
- strlcpy(info->version, VERSION_NUMBER, sizeof(info->version));
+ strncpy(info->driver, driver_name, sizeof(info->driver));
+ strncpy(info->version, VERSION_NUMBER, sizeof(info->version));
}
static struct ethtool_ops ql_net_ethtool_ops;