From d0c0dc2d1815b28b4b9b6f599e891d010f1361df Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Thu, 24 Jun 2021 17:40:17 +0800 Subject: [PATCH] kernel: 5.10: refresh patches Signed-off-by: Tianling Shen --- ...info-Add-model-name-in-proc-cpuinfo-for-64bit-ta.patch | 2 +- ...net-conntrack-events-support-multiple-registrant.patch | 2 +- ...53-net-patch-linux-kernel-to-support-shortcut-fe.patch | 8 ++++---- .../hack-5.10/993-usb-serial-option-add-u9300.patch | 2 +- target/linux/generic/hack-5.10/998-add-ndo-do-ioctl.patch | 4 +--- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/target/linux/generic/hack-5.10/312-arm64-cpuinfo-Add-model-name-in-proc-cpuinfo-for-64bit-ta.patch b/target/linux/generic/hack-5.10/312-arm64-cpuinfo-Add-model-name-in-proc-cpuinfo-for-64bit-ta.patch index 2664758304..70cfadca9c 100644 --- a/target/linux/generic/hack-5.10/312-arm64-cpuinfo-Add-model-name-in-proc-cpuinfo-for-64bit-ta.patch +++ b/target/linux/generic/hack-5.10/312-arm64-cpuinfo-Add-model-name-in-proc-cpuinfo-for-64bit-ta.patch @@ -24,7 +24,7 @@ Signed-off-by: Sumit Gupta --- a/arch/arm64/kernel/cpuinfo.c +++ b/arch/arm64/kernel/cpuinfo.c -@@ -139,9 +139,8 @@ static int c_show(struct seq_file *m, vo +@@ -148,9 +148,8 @@ static int c_show(struct seq_file *m, vo * "processor". Give glibc what it expects. */ seq_printf(m, "processor\t: %d\n", i); diff --git a/target/linux/generic/hack-5.10/952-net-conntrack-events-support-multiple-registrant.patch b/target/linux/generic/hack-5.10/952-net-conntrack-events-support-multiple-registrant.patch index b9743c9681..3bd51dc884 100644 --- a/target/linux/generic/hack-5.10/952-net-conntrack-events-support-multiple-registrant.patch +++ b/target/linux/generic/hack-5.10/952-net-conntrack-events-support-multiple-registrant.patch @@ -273,7 +273,7 @@ struct nf_conn *ct = item->ct; struct sk_buff *skb; unsigned int type; -@@ -3784,9 +3791,15 @@ static int ctnetlink_stat_exp_cpu(struct +@@ -3785,9 +3792,15 @@ static int ctnetlink_stat_exp_cpu(struct } #ifdef CONFIG_NF_CONNTRACK_EVENTS diff --git a/target/linux/generic/hack-5.10/953-net-patch-linux-kernel-to-support-shortcut-fe.patch b/target/linux/generic/hack-5.10/953-net-patch-linux-kernel-to-support-shortcut-fe.patch index d952c8fae0..ac99f3047a 100644 --- a/target/linux/generic/hack-5.10/953-net-patch-linux-kernel-to-support-shortcut-fe.patch +++ b/target/linux/generic/hack-5.10/953-net-patch-linux-kernel-to-support-shortcut-fe.patch @@ -80,7 +80,7 @@ struct net_bridge_port *p; --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -3623,8 +3623,17 @@ static int xmit_one(struct sk_buff *skb, +@@ -3635,8 +3635,17 @@ static int xmit_one(struct sk_buff *skb, unsigned int len; int rc; @@ -98,7 +98,7 @@ len = skb->len; PRANDOM_ADD_NOISE(skb, dev, txq, len + jiffies); -@@ -5147,6 +5156,11 @@ void netdev_rx_handler_unregister(struct +@@ -5178,6 +5187,11 @@ void netdev_rx_handler_unregister(struct } EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister); @@ -110,7 +110,7 @@ /* * Limit the use of PFMEMALLOC reserves to those protocols that implement * the special handling of PFMEMALLOC skbs. -@@ -5195,6 +5209,10 @@ static int __netif_receive_skb_core(stru +@@ -5226,6 +5240,10 @@ static int __netif_receive_skb_core(stru int ret = NET_RX_DROP; __be16 type; @@ -121,7 +121,7 @@ net_timestamp_check(!netdev_tstamp_prequeue, skb); trace_netif_receive_skb(skb); -@@ -5234,6 +5252,16 @@ another_round: +@@ -5265,6 +5283,16 @@ another_round: goto out; } diff --git a/target/linux/generic/hack-5.10/993-usb-serial-option-add-u9300.patch b/target/linux/generic/hack-5.10/993-usb-serial-option-add-u9300.patch index 00cb6cd9b2..c67ae6321f 100644 --- a/target/linux/generic/hack-5.10/993-usb-serial-option-add-u9300.patch +++ b/target/linux/generic/hack-5.10/993-usb-serial-option-add-u9300.patch @@ -1,6 +1,6 @@ --- a/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c -@@ -1351,6 +1351,7 @@ static const struct usb_device_id produc +@@ -1337,6 +1337,7 @@ static const struct usb_device_id produc {QMI_FIXED_INTF(0x03f0, 0x9d1d, 1)}, /* HP lt4120 Snapdragon X5 LTE */ {QMI_FIXED_INTF(0x22de, 0x9061, 3)}, /* WeTelecom WPD-600N */ {QMI_QUIRK_SET_DTR(0x1e0e, 0x9001, 5)}, /* SIMCom 7100E, 7230E, 7600E ++ */ diff --git a/target/linux/generic/hack-5.10/998-add-ndo-do-ioctl.patch b/target/linux/generic/hack-5.10/998-add-ndo-do-ioctl.patch index 43e3e628a4..da206e4b46 100644 --- a/target/linux/generic/hack-5.10/998-add-ndo-do-ioctl.patch +++ b/target/linux/generic/hack-5.10/998-add-ndo-do-ioctl.patch @@ -1,8 +1,6 @@ -diff --git a/net/wireless/wext-core.c b/net/wireless/wext-core.c -index 6cdb0544..7d1e09e3 100644 --- a/net/wireless/wext-core.c +++ b/net/wireless/wext-core.c -@@ -956,6 +956,9 @@ static int wireless_process_ioctl(struct net *net, struct iwreq *iwr, +@@ -956,6 +956,9 @@ static int wireless_process_ioctl(struct else if (private) return private(dev, iwr, cmd, info, handler); }