From 9923b33ffd7fdff3fc2c93263cf0a4011eec630c Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Wed, 3 Mar 2021 12:25:45 +0800 Subject: [PATCH] kernel: 5.4: refresh hack patches Signed-off-by: Tianling Shen --- ...onntrack-events-support-multiple-registrant.patch | 2 +- .../generic/hack-5.4/992-add-ndo-do-ioctl.patch | 2 +- .../hack-5.4/993-usb-serial-option-add-u9300.patch | 6 +++--- .../pending-5.4/601-add-kernel-imq-support.patch | 12 ++++++------ 4 files changed, 11 insertions(+), 11 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 6262995b85..eca187235d 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 @@ -93,7 +93,7 @@ depends on NETFILTER_ADVANCED --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c -@@ -2591,6 +2591,9 @@ int nf_conntrack_init_net(struct net *ne +@@ -2592,6 +2592,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/992-add-ndo-do-ioctl.patch b/target/linux/generic/hack-5.4/992-add-ndo-do-ioctl.patch index f9b7a380f2..da206e4b46 100644 --- a/target/linux/generic/hack-5.4/992-add-ndo-do-ioctl.patch +++ b/target/linux/generic/hack-5.4/992-add-ndo-do-ioctl.patch @@ -1,6 +1,6 @@ --- a/net/wireless/wext-core.c +++ b/net/wireless/wext-core.c -@@ -955,6 +955,9 @@ static int wireless_process_ioctl(struct +@@ -956,6 +956,9 @@ static int wireless_process_ioctl(struct else if (private) return private(dev, iwr, cmd, info, handler); } 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 4e3314fada..2ea6783362 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 -@@ -1370,6 +1370,7 @@ static const struct usb_device_id produc +@@ -1373,6 +1373,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 ++ */ @@ -18,7 +18,7 @@ /* 4G Systems products */ /* This is the 4G XS Stick W14 a.k.a. Mobilcom Debitel Surf-Stick * -@@ -578,6 +579,16 @@ static void option_instat_callback(struc +@@ -580,6 +581,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) }, -@@ -612,6 +623,8 @@ static const struct usb_device_id option +@@ -614,6 +625,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/pending-5.4/601-add-kernel-imq-support.patch b/target/linux/generic/pending-5.4/601-add-kernel-imq-support.patch index 2274fe4623..d538807ee2 100644 --- a/target/linux/generic/pending-5.4/601-add-kernel-imq-support.patch +++ b/target/linux/generic/pending-5.4/601-add-kernel-imq-support.patch @@ -1,6 +1,6 @@ --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig -@@ -283,6 +283,125 @@ config RIONET_RX_SIZE +@@ -326,6 +326,125 @@ config RIONET_RX_SIZE depends on RIONET default "128" @@ -128,7 +128,7 @@ depends on INET --- a/drivers/net/Makefile +++ b/drivers/net/Makefile -@@ -13,6 +13,7 @@ obj-$(CONFIG_DUMMY) += dummy.o +@@ -14,6 +14,7 @@ obj-$(CONFIG_WIREGUARD) += wireguard/ obj-$(CONFIG_EQUALIZER) += eql.o obj-$(CONFIG_IFB) += ifb.o obj-$(CONFIG_MACSEC) += macsec.o @@ -1243,7 +1243,7 @@ extern struct kmem_cache *skbuff_head_cache; void kfree_skb_partial(struct sk_buff *skb, bool head_stolen); -@@ -4231,6 +4247,10 @@ static inline void __nf_copy(struct sk_b +@@ -4236,6 +4252,10 @@ static inline void __nf_copy(struct sk_b dst->_nfct = src->_nfct; nf_conntrack_get(skb_nfct(src)); #endif @@ -1402,7 +1402,7 @@ /** * skb_panic - private function for out-of-line support * @skb: buffer -@@ -651,6 +701,28 @@ void skb_release_head_state(struct sk_bu +@@ -660,6 +710,28 @@ void skb_release_head_state(struct sk_bu WARN_ON(in_irq()); skb->destructor(skb); } @@ -1431,7 +1431,7 @@ #if IS_ENABLED(CONFIG_NF_CONNTRACK) nf_conntrack_put(skb_nfct(skb)); #endif -@@ -935,6 +1007,9 @@ static void __copy_skb_header(struct sk_ +@@ -944,6 +1016,9 @@ static void __copy_skb_header(struct sk_ skb_dst_copy(new, old); __skb_ext_copy(new, old); __nf_copy(new, old, false); @@ -1441,7 +1441,7 @@ /* Note : this field could be in headers_start/headers_end section * It is not yet because we do not want to have a 16 bit hole -@@ -4161,6 +4236,13 @@ void __init skb_init(void) +@@ -4170,6 +4245,13 @@ void __init skb_init(void) 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);