kernel: 5.10: refresh patches

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2021-06-24 17:40:17 +08:00
parent af58b06b9b
commit d0c0dc2d18
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
5 changed files with 8 additions and 10 deletions

View File

@ -24,7 +24,7 @@ Signed-off-by: Sumit Gupta <sumitg@nvidia.com>
--- 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);

View File

@ -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

View File

@ -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;
}

View File

@ -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 ++ */

View File

@ -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);
}