aio-3399b
/
coolsnowwolf_lede
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: aio-3399b:94d36f4e1e847d1e332579d863900e236e537e0b
Branches Tags
aio-3399b:master
...
compare: aio-3399b:86b775c2aa079bede46a191ccce365748b2842d1
Branches Tags
aio-3399b:master

4 Commits
94d36f4e1e ... 86b775c2aa

Author SHA1 Message Date
kos 86b775c2aa Merge branch 'master' of https://github.com/coolsnowwolf/lede 2024-04-13 11:39:11 +00:00
coolsnowwolf 784b562e90 USB: serial: option: add MEDIATEK FM350-GL module usb mode support 2024-04-13 11:03:00 +08:00
Beginner 9e29b15c05
kernel: refresh `6.6` patches (#12069) 2024-04-13 10:57:10 +08:00
Beginner 0bc2188f41
kernel: refresh `6.1` patches (#12068) 2024-04-13 10:56:47 +08:00
11 changed files with 65 additions and 13 deletions
Show Stats Expand all files Collapse all files

4
target/linux/generic/hack-6.1/721-net-add-packet-mangeling.patch
View File

@ -60,7 +60,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
*/
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -3040,6 +3040,10 @@ static inline int pskb_trim(struct sk_bu
@@ -3035,6 +3035,10 @@ static inline int pskb_trim(struct sk_bu
return (len < skb->len) ? __pskb_trim(skb, len) : 0;
}
@ -71,7 +71,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/**
* pskb_trim_unique - remove end from a paged unique (not cloned) buffer
* @skb: buffer to alter
@@ -3189,16 +3193,6 @@ static inline struct sk_buff *dev_alloc_
@@ -3184,16 +3188,6 @@ static inline struct sk_buff *dev_alloc_
}

2
target/linux/generic/hack-6.1/930-Revert-Revert-Revert-driver-core-Set-fw_devlink-on-b.patch
View File

@ -19,7 +19,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1702,7 +1702,7 @@ static void device_links_purge(struct de
@@ -1717,7 +1717,7 @@ static void device_links_purge(struct de
#define FW_DEVLINK_FLAGS_RPM (FW_DEVLINK_FLAGS_ON | \
DL_FLAG_PM_RUNTIME)

26
target/linux/generic/hack-6.1/930-usb-net-for-fm350.patch Normal file
View File

@ -0,0 +1,26 @@
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -589,6 +589,7 @@
static const struct usb_device_id option_ids[] = {
+ { USB_DEVICE(MEDIATEK_VENDOR_ID, 0x7127) },
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_LIGHT) },
@@ -2210,6 +2211,15 @@
if (device_flags & NUMEP2 && iface_desc->bNumEndpoints != 2)
return -ENODEV;
+ if(id->idVendor == MEDIATEK_VENDOR_ID &&
+ (id->idProduct == cpu_to_le16(0x7127) &&
+ ((serial->interface->cur_altsetting->desc.bInterfaceNumber <= 5) ||
+ (serial->interface->cur_altsetting->desc.bInterfaceNumber >= 7))))
+ {
+ printk(KERN_INFO "Discovery the interface for Fibocom & MEDIATEK.");
+ return -ENODEV;
+ }
+
/* Store the device flags so we can use them during attach. */
usb_set_serial_data(serial, (void *)device_flags);

2
target/linux/generic/hack-6.1/953-net-patch-linux-kernel-to-support-shortcut-fe.patch
View File

@ -12,7 +12,7 @@
struct list_head *br_ip_list);
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -995,6 +995,10 @@ struct sk_buff {
@@ -990,6 +990,10 @@ struct sk_buff {
__u8 csum_not_inet:1;
__u8 scm_io_uring:1;

26
target/linux/generic/hack-6.6/930-usb-net-for-fm350.patch Normal file
View File

@ -0,0 +1,26 @@
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -589,6 +589,7 @@
static const struct usb_device_id option_ids[] = {
+ { USB_DEVICE(MEDIATEK_VENDOR_ID, 0x7127) },
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_LIGHT) },
@@ -2210,6 +2211,15 @@
if (device_flags & NUMEP2 && iface_desc->bNumEndpoints != 2)
return -ENODEV;
+ if(id->idVendor == MEDIATEK_VENDOR_ID &&
+ (id->idProduct == cpu_to_le16(0x7127) &&
+ ((serial->interface->cur_altsetting->desc.bInterfaceNumber <= 5) ||
+ (serial->interface->cur_altsetting->desc.bInterfaceNumber >= 7))))
+ {
+ printk(KERN_INFO "Discovery the interface for Fibocom & MEDIATEK.");
+ return -ENODEV;
+ }
+
/* Store the device flags so we can use them during attach. */
usb_set_serial_data(serial, (void *)device_flags);

2
target/linux/generic/hack-6.6/953-net-patch-linux-kernel-to-support-shortcut-fe.patch
View File

@ -12,7 +12,7 @@
struct list_head *br_ip_list);
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -991,6 +991,10 @@ struct sk_buff {
@@ -986,6 +986,10 @@ struct sk_buff {
__u8 csum_not_inet:1;
#endif

2
target/linux/generic/pending-6.1/610-netfilter_match_bypass_default_checks.patch
View File

@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
for (i = sizeof(struct ipt_entry);
i < e->target_offset;
i += m->u.match_size) {
@@ -1223,12 +1260,15 @@ compat_copy_entry_to_user(struct ipt_ent
@@ -1225,12 +1262,15 @@ compat_copy_entry_to_user(struct ipt_ent
compat_uint_t origsize;
const struct xt_entry_match *ematch;
int ret = 0;

2
target/linux/generic/pending-6.1/655-increase_skb_pad.patch
View File

@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -3006,7 +3006,7 @@ static inline int pskb_network_may_pull(
@@ -3001,7 +3001,7 @@ static inline int pskb_network_may_pull(
* NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
*/
#ifndef NET_SKB_PAD

4
target/linux/generic/pending-6.1/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
View File

@ -22,7 +22,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#endif
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -972,6 +972,7 @@ struct sk_buff {
@@ -967,6 +967,7 @@ struct sk_buff {
#ifdef CONFIG_IPV6_NDISC_NODETYPE
__u8 ndisc_nodetype:2;
#endif
@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
__u8 inner_protocol_type:1;
--- a/net/core/gro.c
+++ b/net/core/gro.c
@@ -491,6 +491,9 @@ static enum gro_result dev_gro_receive(s
@@ -492,6 +492,9 @@ static enum gro_result dev_gro_receive(s
int same_flow;
int grow;

4
target/linux/rockchip/patches-6.1/101-net-realtek-r8169-add-LED-configuration-from-OF.patch
View File

@ -25,7 +25,7 @@ Subject: [PATCH] r8169: add LED configuration from OF
TxDescStartAddrLow = 0x20,
TxDescStartAddrHigh = 0x24,
TxHDescStartAddrLow = 0x28,
@@ -5179,6 +5181,22 @@ static bool rtl_aspm_is_safe(struct rtl8
@@ -5265,6 +5267,22 @@ static bool rtl_aspm_is_safe(struct rtl8
return false;
}
@ -48,7 +48,7 @@ Subject: [PATCH] r8169: add LED configuration from OF
static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
{
struct rtl8169_private *tp;
@@ -5347,6 +5365,7 @@ static int rtl_init_one(struct pci_dev *
@@ -5436,6 +5454,7 @@ static int rtl_init_one(struct pci_dev *
if (!tp->counters)
return -ENOMEM;

4
target/linux/rockchip/patches-6.6/101-net-realtek-r8169-add-LED-configuration-from-OF.patch
View File

@ -25,7 +25,7 @@ Subject: [PATCH] r8169: add LED configuration from OF
TxDescStartAddrLow = 0x20,
TxDescStartAddrHigh = 0x24,
TxHDescStartAddrLow = 0x28,
@@ -5202,6 +5204,22 @@ static bool rtl_aspm_is_safe(struct rtl8
@@ -5234,6 +5236,22 @@ static bool rtl_aspm_is_safe(struct rtl8
return false;
}
@ -48,7 +48,7 @@ Subject: [PATCH] r8169: add LED configuration from OF
static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
{
struct rtl8169_private *tp;
@@ -5373,6 +5391,7 @@ static int rtl_init_one(struct pci_dev *
@@ -5405,6 +5423,7 @@ static int rtl_init_one(struct pci_dev *
if (!tp->counters)
return -ENOMEM;