generic: refresh patches

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2022-01-04 16:32:35 +08:00
parent e12d002ab8
commit 0ee08597f5
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
3 changed files with 11 additions and 11 deletions

View File

@ -295,7 +295,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
struct nf_conn *ct = item->ct;
struct sk_buff *skb;
unsigned int type;
@@ -3788,9 +3795,15 @@ static int ctnetlink_stat_exp_cpu(struct
@@ -3786,9 +3793,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
@@ -3635,8 +3635,17 @@ static int xmit_one(struct sk_buff *skb,
@@ -3643,8 +3643,17 @@ static int xmit_one(struct sk_buff *skb,
unsigned int len;
int rc;
@ -96,9 +96,9 @@
+ }
+#endif
len = skb->len;
PRANDOM_ADD_NOISE(skb, dev, txq, len + jiffies);
@@ -5178,6 +5187,11 @@ void netdev_rx_handler_unregister(struct
#ifdef CONFIG_ETHERNET_PACKET_MANGLE
if (dev->eth_mangle_tx && !(skb = dev->eth_mangle_tx(dev, skb)))
@@ -5195,6 +5204,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.
@@ -5226,6 +5240,10 @@ static int __netif_receive_skb_core(stru
@@ -5243,6 +5257,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);
@@ -5265,6 +5283,16 @@ another_round:
@@ -5282,6 +5300,16 @@ another_round:
goto out;
}
@ -140,7 +140,7 @@
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -475,3 +475,6 @@ config HAVE_CBPF_JIT
@@ -481,3 +481,6 @@ config HAVE_CBPF_JIT
# Extended BPF JIT (eBPF)
config HAVE_EBPF_JIT
bool

View File

@ -10,7 +10,7 @@
{QMI_QUIRK_SET_DTR(0x2c7c, 0x0195, 4)}, /* Quectel EG95 */
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -384,6 +384,7 @@ static void option_instat_callback(struc
@@ -386,6 +386,7 @@ static void option_instat_callback(struc
* Mobidata, etc sell under their own brand names.
*/
#define LONGCHEER_VENDOR_ID 0x1c9e
@ -18,7 +18,7 @@
/* 4G Systems products */
/* This is the 4G XS Stick W14 a.k.a. Mobilcom Debitel Surf-Stick *
@@ -581,6 +582,16 @@ static void option_instat_callback(struc
@@ -583,6 +584,16 @@ static void option_instat_callback(struc
/* Device needs ZLP */
#define ZLP BIT(17)
@ -35,7 +35,7 @@
static const struct usb_device_id option_ids[] = {
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
@@ -615,6 +626,8 @@ static const struct usb_device_id option
@@ -617,6 +628,8 @@ static const struct usb_device_id option
{ USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLE) },
{ USB_DEVICE(QUANTA_VENDOR_ID, 0xea42),
.driver_info = RSVD(4) },