From ab869f9cd02c19362f6e4a22fdb1431d5ed9ca7a Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Mon, 22 Mar 2021 18:54:08 +0800 Subject: [PATCH] kernel: 5.10: refresh patches Signed-off-by: Tianling Shen --- ...53-net-patch-linux-kernel-to-support-shortcut-fe.patch | 8 ++++---- .../hack-5.10/993-usb-serial-option-add-u9300.patch | 2 +- .../806-arm64-dts-rockchip-rk3328-add-dfi-node.patch | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) 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 e6ac67c6f8..d952c8fae0 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 -@@ -3602,8 +3602,17 @@ static int xmit_one(struct sk_buff *skb, +@@ -3623,8 +3623,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); -@@ -5108,6 +5117,11 @@ void netdev_rx_handler_unregister(struct +@@ -5147,6 +5156,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. -@@ -5156,6 +5170,10 @@ static int __netif_receive_skb_core(stru +@@ -5195,6 +5209,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); -@@ -5195,6 +5213,16 @@ another_round: +@@ -5234,6 +5252,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 a819283239..00cb6cd9b2 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 -@@ -1350,6 +1350,7 @@ static const struct usb_device_id produc +@@ -1351,6 +1351,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/rockchip/patches-5.10/806-arm64-dts-rockchip-rk3328-add-dfi-node.patch b/target/linux/rockchip/patches-5.10/806-arm64-dts-rockchip-rk3328-add-dfi-node.patch index ebdce52004..8a5222da22 100644 --- a/target/linux/rockchip/patches-5.10/806-arm64-dts-rockchip-rk3328-add-dfi-node.patch +++ b/target/linux/rockchip/patches-5.10/806-arm64-dts-rockchip-rk3328-add-dfi-node.patch @@ -11,7 +11,7 @@ Signed-off-by: Tianling Shen --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -@@ -1021,6 +1021,13 @@ +@@ -1022,6 +1022,13 @@ }; };