kernel: bump 6.x to latest HEAD

This commit is contained in:
coolsnowwolf 2025-04-13 23:22:17 +08:00
parent 91d0fd154f
commit 34e8beace9
7 changed files with 89 additions and 29 deletions

View File

@ -1,2 +1,2 @@
LINUX_VERSION-6.1 = .133 LINUX_VERSION-6.1 = .134
LINUX_KERNEL_HASH-6.1.133 = 97b59faf3f1925f296442a73a64439a447366f1d434be579803877097c5abe70 LINUX_KERNEL_HASH-6.1.134 = 60c70cdd70ddee384c004242e67844e3dd1fe28f75b26b3586859fff0a07bd23

View File

@ -1,2 +1,2 @@
LINUX_VERSION-6.12 = .22 LINUX_VERSION-6.12 = .23
LINUX_KERNEL_HASH-6.12.22 = ab48800ab49985a78d2318ae8ac5f28fd3e123ea17357ef21498105a53337336 LINUX_KERNEL_HASH-6.12.23 = d8d95404f8deeb7ff6992c0df855025062e9e8182bca6daa27ef2e9275d27749

View File

@ -1,2 +1,2 @@
LINUX_VERSION-6.6 = .86 LINUX_VERSION-6.6 = .87
LINUX_KERNEL_HASH-6.6.86 = 49e3ad7423e40735faada0cd39665c071d47efd84ec3548acf119c9704f13e68 LINUX_KERNEL_HASH-6.6.87 = 8957e5c2dacdbc47a16dbf1f6303ca7088409be6197a3881f752313275357ac6

View File

@ -13,7 +13,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
--- a/drivers/net/usb/rndis_host.c --- a/drivers/net/usb/rndis_host.c
+++ b/drivers/net/usb/rndis_host.c +++ b/drivers/net/usb/rndis_host.c
@@ -630,6 +630,16 @@ static const struct driver_info zte_rndi @@ -640,6 +640,16 @@ static const struct driver_info zte_rndi
.tx_fixup = rndis_tx_fixup, .tx_fixup = rndis_tx_fixup,
}; };
@ -30,10 +30,11 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
static const struct usb_device_id products [] = { static const struct usb_device_id products [] = {
@@ -666,6 +676,36 @@ static const struct usb_device_id produc @@ -675,6 +685,36 @@ static const struct usb_device_id produc
/* RNDIS for tethering */
USB_INTERFACE_INFO(USB_CLASS_WIRELESS_CONTROLLER, 1, 3), USB_INTERFACE_INFO(USB_CLASS_WIRELESS_CONTROLLER, 1, 3),
.driver_info = (unsigned long) &rndis_info, .driver_info = (unsigned long) &rndis_info,
}, { +}, {
+ /* Quectel EG060V rndis device */ + /* Quectel EG060V rndis device */
+ USB_DEVICE_AND_INTERFACE_INFO(0x2c7c, 0x6004, + USB_DEVICE_AND_INTERFACE_INFO(0x2c7c, 0x6004,
+ USB_CLASS_WIRELESS_CONTROLLER, 1, 3), + USB_CLASS_WIRELESS_CONTROLLER, 1, 3),
@ -63,7 +64,6 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+ USB_DEVICE_AND_INTERFACE_INFO(0x2dee, 0x4d49, + USB_DEVICE_AND_INTERFACE_INFO(0x2dee, 0x4d49,
+ USB_CLASS_WIRELESS_CONTROLLER, 1, 3), + USB_CLASS_WIRELESS_CONTROLLER, 1, 3),
+ .driver_info = (unsigned long) &asr_rndis_info, + .driver_info = (unsigned long) &asr_rndis_info,
+}, { }, {
/* Novatel Verizon USB730L */ /* Mobile Broadband Modem, seen in Novatel Verizon USB730L and
USB_INTERFACE_INFO(USB_CLASS_MISC, 4, 1), * Telit FN990A (RNDIS)
.driver_info = (unsigned long) &rndis_info,

View File

@ -83,15 +83,6 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
__stop_unwind_tab = .; \ __stop_unwind_tab = .; \
} }
@@ -125,7 +125,7 @@
__vectors_lma = .; \
OVERLAY 0xffff0000 : NOCROSSREFS AT(__vectors_lma) { \
.vectors { \
- *(.vectors) \
+ KEEP(*(.vectors)) \
} \
.vectors.bhb.loop8 { \
*(.vectors.bhb.loop8) \
@@ -143,7 +143,7 @@ @@ -143,7 +143,7 @@
\ \
__stubs_lma = .; \ __stubs_lma = .; \

View File

@ -0,0 +1,69 @@
From 9fabf60187f1fa19e6f6bb5441587d485bd534b0 Mon Sep 17 00:00:00 2001
From: Daniel Golle <daniel@makrotopia.org>
Date: Tue, 9 Apr 2024 17:06:38 +0100
Subject: [PATCH] rndis_host: add a bunch of USB IDs
Add a bunch of USB IDs found in various places online to the
RNDIS USB network driver.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
drivers/net/usb/rndis_host.c | 40 ++++++++++++++++++++++
1 file changed, 40 insertions(+)
--- a/drivers/net/usb/rndis_host.c
+++ b/drivers/net/usb/rndis_host.c
@@ -640,6 +640,16 @@ static const struct driver_info zte_rndi
.tx_fixup = rndis_tx_fixup,
};
+static const struct driver_info asr_rndis_info = {
+ .description = "Asr RNDIS device",
+ .flags = FLAG_WWAN | FLAG_POINTTOPOINT | FLAG_FRAMING_RN | FLAG_NO_SETINT | FLAG_NOARP,
+ .bind = rndis_bind,
+ .unbind = rndis_unbind,
+ .status = rndis_status,
+ .rx_fixup = rndis_rx_fixup,
+ .tx_fixup = rndis_tx_fixup,
+};
+
/*-------------------------------------------------------------------------*/
static const struct usb_device_id products [] = {
@@ -675,6 +685,36 @@ static const struct usb_device_id produc
/* RNDIS for tethering */
USB_INTERFACE_INFO(USB_CLASS_WIRELESS_CONTROLLER, 1, 3),
.driver_info = (unsigned long) &rndis_info,
+}, {
+ /* Quectel EG060V rndis device */
+ USB_DEVICE_AND_INTERFACE_INFO(0x2c7c, 0x6004,
+ USB_CLASS_WIRELESS_CONTROLLER, 1, 3),
+ .driver_info = (unsigned long) &asr_rndis_info,
+}, {
+ /* Quectel EC200A rndis device */
+ USB_DEVICE_AND_INTERFACE_INFO(0x2c7c, 0x6005,
+ USB_CLASS_WIRELESS_CONTROLLER, 1, 3),
+ .driver_info = (unsigned long) &asr_rndis_info,
+}, {
+ /* Quectel EC200T rndis device */
+ USB_DEVICE_AND_INTERFACE_INFO(0x2c7c, 0x6026,
+ USB_CLASS_WIRELESS_CONTROLLER, 1, 3),
+ .driver_info = (unsigned long) &asr_rndis_info,
+}, {
+ /* Simcom A7906E rndis device */
+ USB_DEVICE_AND_INTERFACE_INFO(0x1e0e, 0x9011,
+ USB_CLASS_WIRELESS_CONTROLLER, 1, 3),
+ .driver_info = (unsigned long) &asr_rndis_info,
+}, {
+ /* Meig SLM770A */
+ USB_DEVICE_AND_INTERFACE_INFO(0x2dee, 0x4d57,
+ USB_CLASS_WIRELESS_CONTROLLER, 1, 3),
+ .driver_info = (unsigned long) &asr_rndis_info,
+}, {
+ /* Meig SLM828 */
+ USB_DEVICE_AND_INTERFACE_INFO(0x2dee, 0x4d49,
+ USB_CLASS_WIRELESS_CONTROLLER, 1, 3),
+ .driver_info = (unsigned long) &asr_rndis_info,
}, {
/* Mobile Broadband Modem, seen in Novatel Verizon USB730L and
* Telit FN990A (RNDIS)

View File

@ -13,7 +13,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
--- a/drivers/net/usb/rndis_host.c --- a/drivers/net/usb/rndis_host.c
+++ b/drivers/net/usb/rndis_host.c +++ b/drivers/net/usb/rndis_host.c
@@ -630,6 +630,16 @@ static const struct driver_info zte_rndi @@ -640,6 +640,16 @@ static const struct driver_info zte_rndi
.tx_fixup = rndis_tx_fixup, .tx_fixup = rndis_tx_fixup,
}; };
@ -30,10 +30,11 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
static const struct usb_device_id products [] = { static const struct usb_device_id products [] = {
@@ -666,6 +676,36 @@ static const struct usb_device_id produc @@ -675,6 +685,36 @@ static const struct usb_device_id produc
/* RNDIS for tethering */
USB_INTERFACE_INFO(USB_CLASS_WIRELESS_CONTROLLER, 1, 3), USB_INTERFACE_INFO(USB_CLASS_WIRELESS_CONTROLLER, 1, 3),
.driver_info = (unsigned long) &rndis_info, .driver_info = (unsigned long) &rndis_info,
}, { +}, {
+ /* Quectel EG060V rndis device */ + /* Quectel EG060V rndis device */
+ USB_DEVICE_AND_INTERFACE_INFO(0x2c7c, 0x6004, + USB_DEVICE_AND_INTERFACE_INFO(0x2c7c, 0x6004,
+ USB_CLASS_WIRELESS_CONTROLLER, 1, 3), + USB_CLASS_WIRELESS_CONTROLLER, 1, 3),
@ -63,7 +64,6 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+ USB_DEVICE_AND_INTERFACE_INFO(0x2dee, 0x4d49, + USB_DEVICE_AND_INTERFACE_INFO(0x2dee, 0x4d49,
+ USB_CLASS_WIRELESS_CONTROLLER, 1, 3), + USB_CLASS_WIRELESS_CONTROLLER, 1, 3),
+ .driver_info = (unsigned long) &asr_rndis_info, + .driver_info = (unsigned long) &asr_rndis_info,
+}, { }, {
/* Novatel Verizon USB730L */ /* Mobile Broadband Modem, seen in Novatel Verizon USB730L and
USB_INTERFACE_INFO(USB_CLASS_MISC, 4, 1), * Telit FN990A (RNDIS)
.driver_info = (unsigned long) &rndis_info,