From 8dbbef02fd4045385c23d192c12916bd5bd72d30 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sat, 10 Sep 2022 09:50:14 +0800 Subject: [PATCH] kernel: refresh generic patches Signed-off-by: Tianling Shen --- ...-conntrack-events-support-multiple-registrant.patch | 2 +- ...net-patch-linux-kernel-to-support-shortcut-fe.patch | 10 +++++----- .../hack-5.4/993-usb-serial-option-add-u9300.patch | 8 ++++---- .../linux/generic/hack-5.4/998-add-ndo-do-ioctl.patch | 7 +++---- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/target/linux/generic/hack-5.4/952-net-conntrack-events-support-multiple-registrant.patch b/target/linux/generic/hack-5.4/952-net-conntrack-events-support-multiple-registrant.patch index 31a53dd52d..c763449594 100644 --- a/target/linux/generic/hack-5.4/952-net-conntrack-events-support-multiple-registrant.patch +++ b/target/linux/generic/hack-5.4/952-net-conntrack-events-support-multiple-registrant.patch @@ -115,7 +115,7 @@ Signed-off-by: Zhi Chen depends on NETFILTER_ADVANCED --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c -@@ -2597,6 +2597,9 @@ int nf_conntrack_init_net(struct net *ne +@@ -2572,6 +2572,9 @@ int nf_conntrack_init_net(struct net *ne nf_conntrack_helper_pernet_init(net); nf_conntrack_proto_pernet_init(net); diff --git a/target/linux/generic/hack-5.4/953-net-patch-linux-kernel-to-support-shortcut-fe.patch b/target/linux/generic/hack-5.4/953-net-patch-linux-kernel-to-support-shortcut-fe.patch index d689517d90..bc9eb6e4de 100644 --- a/target/linux/generic/hack-5.4/953-net-patch-linux-kernel-to-support-shortcut-fe.patch +++ b/target/linux/generic/hack-5.4/953-net-patch-linux-kernel-to-support-shortcut-fe.patch @@ -49,7 +49,7 @@ int (*fcn)(unsigned int events, struct nf_ct_event *item); --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c -@@ -761,6 +761,28 @@ void br_port_flags_change(struct net_bri +@@ -763,6 +763,28 @@ void br_port_flags_change(struct net_bri br_recalculate_neigh_suppress_enabled(br); } @@ -80,7 +80,7 @@ struct net_bridge_port *p; --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -3189,9 +3189,17 @@ static int xmit_one(struct sk_buff *skb, +@@ -3218,9 +3218,17 @@ static int xmit_one(struct sk_buff *skb, unsigned int len; int rc; @@ -99,7 +99,7 @@ #ifdef CONFIG_ETHERNET_PACKET_MANGLE if (!dev->eth_mangle_tx || (skb = dev->eth_mangle_tx(dev, skb)) != NULL) -@@ -4702,6 +4710,11 @@ void netdev_rx_handler_unregister(struct +@@ -4753,6 +4761,11 @@ void netdev_rx_handler_unregister(struct } EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister); @@ -111,7 +111,7 @@ /* * Limit the use of PFMEMALLOC reserves to those protocols that implement * the special handling of PFMEMALLOC skbs. -@@ -4752,6 +4765,10 @@ static int __netif_receive_skb_core(stru +@@ -4803,6 +4816,10 @@ static int __netif_receive_skb_core(stru int ret = NET_RX_DROP; __be16 type; @@ -122,7 +122,7 @@ net_timestamp_check(!netdev_tstamp_prequeue, skb); trace_netif_receive_skb(skb); -@@ -4791,6 +4808,16 @@ another_round: +@@ -4842,6 +4859,16 @@ another_round: goto out; } diff --git a/target/linux/generic/hack-5.4/993-usb-serial-option-add-u9300.patch b/target/linux/generic/hack-5.4/993-usb-serial-option-add-u9300.patch index c1eaceeb3c..3eec70b649 100644 --- a/target/linux/generic/hack-5.4/993-usb-serial-option-add-u9300.patch +++ b/target/linux/generic/hack-5.4/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 -@@ -1373,6 +1373,7 @@ static const struct usb_device_id produc +@@ -1363,6 +1363,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 ++ */ @@ -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 +@@ -390,6 +390,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 +@@ -591,6 +592,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 +@@ -625,6 +636,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) }, diff --git a/target/linux/generic/hack-5.4/998-add-ndo-do-ioctl.patch b/target/linux/generic/hack-5.4/998-add-ndo-do-ioctl.patch index 9cbfc6a1d3..da206e4b46 100644 --- a/target/linux/generic/hack-5.4/998-add-ndo-do-ioctl.patch +++ b/target/linux/generic/hack-5.4/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); } @@ -10,4 +8,5 @@ index 6cdb0544..7d1e09e3 100644 + if (dev->netdev_ops->ndo_do_ioctl) + return dev->netdev_ops->ndo_do_ioctl(dev, (struct ifreq *) iwr, cmd); return -EOPNOTSUPP; - } \ No newline at end of file + } +