From 9dd5a7c0560f067e7ee58fcc46641a0819aa2c27 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 24 Oct 2020 12:07:09 +0000 Subject: [PATCH] linux: refresh patches for kernel 5.4 Signed-off-by: CN_SZTL --- target/linux/generic/hack-5.4/721-phy_packets.patch | 4 ++-- ...952-net-conntrack-events-support-multiple-registrant.patch | 2 +- .../generic/hack-5.4/993-usb-serial-option-add-u9300.patch | 4 ++-- target/linux/generic/hack-5.4/998-make-phylink-tristate.patch | 2 +- .../generic/pending-5.4/601-add-kernel-imq-support.patch | 2 +- target/linux/generic/pending-5.4/655-increase_skb_pad.patch | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/target/linux/generic/hack-5.4/721-phy_packets.patch b/target/linux/generic/hack-5.4/721-phy_packets.patch index 68b5bc907f..8a0eaea9d2 100644 --- a/target/linux/generic/hack-5.4/721-phy_packets.patch +++ b/target/linux/generic/hack-5.4/721-phy_packets.patch @@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau */ --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -2683,6 +2683,10 @@ static inline int pskb_trim(struct sk_bu +@@ -2695,6 +2695,10 @@ static inline int pskb_trim(struct sk_bu return (len < skb->len) ? __pskb_trim(skb, len) : 0; } @@ -67,7 +67,7 @@ Signed-off-by: Felix Fietkau /** * pskb_trim_unique - remove end from a paged unique (not cloned) buffer * @skb: buffer to alter -@@ -2814,16 +2818,6 @@ static inline struct sk_buff *dev_alloc_ +@@ -2826,16 +2830,6 @@ static inline struct sk_buff *dev_alloc_ } 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 a4ddc95738..6262995b85 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 @@ -273,7 +273,7 @@ struct nf_conn *ct = item->ct; struct sk_buff *skb; unsigned int type; -@@ -3502,9 +3509,15 @@ static int ctnetlink_stat_exp_cpu(struct +@@ -3504,9 +3511,15 @@ static int ctnetlink_stat_exp_cpu(struct } #ifdef CONFIG_NF_CONNTRACK_EVENTS 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 a38b886bfc..9c8768154f 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 @@ -18,7 +18,7 @@ /* 4G Systems products */ /* This is the 4G XS Stick W14 a.k.a. Mobilcom Debitel Surf-Stick * -@@ -572,6 +573,16 @@ static void option_instat_callback(struc +@@ -573,6 +574,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) }, -@@ -606,6 +617,8 @@ static const struct usb_device_id option +@@ -607,6 +618,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-make-phylink-tristate.patch b/target/linux/generic/hack-5.4/998-make-phylink-tristate.patch index ac3a9afdd2..5e6ce8e9c3 100644 --- a/target/linux/generic/hack-5.4/998-make-phylink-tristate.patch +++ b/target/linux/generic/hack-5.4/998-make-phylink-tristate.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -209,7 +209,7 @@ endif +@@ -210,7 +210,7 @@ endif endif config PHYLINK 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 f4cf1ef2e9..6a13cf3f56 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 @@ -1243,7 +1243,7 @@ extern struct kmem_cache *skbuff_head_cache; void kfree_skb_partial(struct sk_buff *skb, bool head_stolen); -@@ -4218,6 +4234,10 @@ static inline void __nf_copy(struct sk_b +@@ -4231,6 +4247,10 @@ static inline void __nf_copy(struct sk_b dst->_nfct = src->_nfct; nf_conntrack_get(skb_nfct(src)); #endif diff --git a/target/linux/generic/pending-5.4/655-increase_skb_pad.patch b/target/linux/generic/pending-5.4/655-increase_skb_pad.patch index 0d8ae822f5..3ca190f0aa 100644 --- a/target/linux/generic/pending-5.4/655-increase_skb_pad.patch +++ b/target/linux/generic/pending-5.4/655-increase_skb_pad.patch @@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -2649,7 +2649,7 @@ static inline int pskb_network_may_pull( +@@ -2661,7 +2661,7 @@ static inline int pskb_network_may_pull( * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8) */ #ifndef NET_SKB_PAD