From: Greg Kroah-Hartman Date: Mon, 8 May 2023 05:23:32 +0000 (+0200) Subject: 6.1-stable patches X-Git-Tag: v5.15.111~55 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=95e54ef8308b6c9faca10ee7a6b815f5c641d575;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-stable patches added patches: bonding-gcc13-synchronize-bond_-a-t-lb_xmit-types.patch thunderbolt-use-correct-type-in-tb_port_is_clx_enabled-prototype.patch wifi-ath11k-synchronize-ath11k_mac_he_gi_to_nl80211_he_gi-s-return-type.patch --- diff --git a/queue-6.1/bonding-gcc13-synchronize-bond_-a-t-lb_xmit-types.patch b/queue-6.1/bonding-gcc13-synchronize-bond_-a-t-lb_xmit-types.patch new file mode 100644 index 00000000000..6f2384a4ea4 --- /dev/null +++ b/queue-6.1/bonding-gcc13-synchronize-bond_-a-t-lb_xmit-types.patch @@ -0,0 +1,45 @@ +From 777fa87c7682228e155cf0892ba61cb2ab1fe3ae Mon Sep 17 00:00:00 2001 +From: "Jiri Slaby (SUSE)" +Date: Mon, 31 Oct 2022 12:44:09 +0100 +Subject: bonding (gcc13): synchronize bond_{a,t}lb_xmit() types + +From: Jiri Slaby (SUSE) + +commit 777fa87c7682228e155cf0892ba61cb2ab1fe3ae upstream. + +Both bond_alb_xmit() and bond_tlb_xmit() produce a valid warning with +gcc-13: + drivers/net/bonding/bond_alb.c:1409:13: error: conflicting types for 'bond_tlb_xmit' due to enum/integer mismatch; have 'netdev_tx_t(struct sk_buff *, struct net_device *)' ... + include/net/bond_alb.h:160:5: note: previous declaration of 'bond_tlb_xmit' with type 'int(struct sk_buff *, struct net_device *)' + + drivers/net/bonding/bond_alb.c:1523:13: error: conflicting types for 'bond_alb_xmit' due to enum/integer mismatch; have 'netdev_tx_t(struct sk_buff *, struct net_device *)' ... + include/net/bond_alb.h:159:5: note: previous declaration of 'bond_alb_xmit' with type 'int(struct sk_buff *, struct net_device *)' + +I.e. the return type of the declaration is int, while the definitions +spell netdev_tx_t. Synchronize both of them to the latter. + +Cc: Martin Liska +Cc: Jay Vosburgh +Cc: Veaceslav Falico +Cc: Andy Gospodarek +Signed-off-by: Jiri Slaby (SUSE) +Link: https://lore.kernel.org/r/20221031114409.10417-1-jirislaby@kernel.org +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + include/net/bond_alb.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/include/net/bond_alb.h ++++ b/include/net/bond_alb.h +@@ -156,8 +156,8 @@ int bond_alb_init_slave(struct bonding * + void bond_alb_deinit_slave(struct bonding *bond, struct slave *slave); + void bond_alb_handle_link_change(struct bonding *bond, struct slave *slave, char link); + void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave); +-int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev); +-int bond_tlb_xmit(struct sk_buff *skb, struct net_device *bond_dev); ++netdev_tx_t bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev); ++netdev_tx_t bond_tlb_xmit(struct sk_buff *skb, struct net_device *bond_dev); + struct slave *bond_xmit_alb_slave_get(struct bonding *bond, + struct sk_buff *skb); + struct slave *bond_xmit_tlb_slave_get(struct bonding *bond, diff --git a/queue-6.1/series b/queue-6.1/series index c45fe3b1ecc..101fdee1807 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -606,3 +606,6 @@ dm-don-t-lock-fs-when-the-map-is-null-in-process-of-resume.patch blk-iocost-avoid-64-bit-division-in-ioc_timer_fn.patch cifs-fix-potential-use-after-free-bugs-in-tcp_server_info-hostname.patch cifs-protect-session-status-check-in-smb2_reconnect.patch +thunderbolt-use-correct-type-in-tb_port_is_clx_enabled-prototype.patch +bonding-gcc13-synchronize-bond_-a-t-lb_xmit-types.patch +wifi-ath11k-synchronize-ath11k_mac_he_gi_to_nl80211_he_gi-s-return-type.patch diff --git a/queue-6.1/thunderbolt-use-correct-type-in-tb_port_is_clx_enabled-prototype.patch b/queue-6.1/thunderbolt-use-correct-type-in-tb_port_is_clx_enabled-prototype.patch new file mode 100644 index 00000000000..7c69655d140 --- /dev/null +++ b/queue-6.1/thunderbolt-use-correct-type-in-tb_port_is_clx_enabled-prototype.patch @@ -0,0 +1,36 @@ +From d31137619776f9c173a46a79bc7733a2b106061f Mon Sep 17 00:00:00 2001 +From: "Jiri Slaby (SUSE)" +Date: Mon, 12 Dec 2022 11:29:36 +0100 +Subject: thunderbolt: Use correct type in tb_port_is_clx_enabled() prototype + +From: Jiri Slaby (SUSE) + +commit d31137619776f9c173a46a79bc7733a2b106061f upstream. + +tb_port_is_clx_enabled() generates a valid warning with gcc-13: + drivers/thunderbolt/switch.c:1286:6: error: conflicting types for 'tb_port_is_clx_enabled' due to enum/integer mismatch; have 'bool(struct tb_port *, unsigned int)' ... + drivers/thunderbolt/tb.h:1050:6: note: previous declaration of 'tb_port_is_clx_enabled' with type 'bool(struct tb_port *, enum tb_clx)' ... + +I.e. the type of the 2nd parameter of tb_port_is_clx_enabled() in the +declaration is unsigned int, while the definition spells enum tb_clx. +Synchronize them to the former as the parameter is in fact a mask of the +enum values. + +Signed-off-by: Jiri Slaby (SUSE) +Signed-off-by: Mika Westerberg +Signed-off-by: Greg Kroah-Hartman +--- + drivers/thunderbolt/tb.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/thunderbolt/tb.h ++++ b/drivers/thunderbolt/tb.h +@@ -1058,7 +1058,7 @@ void tb_port_lane_bonding_disable(struct + int tb_port_wait_for_link_width(struct tb_port *port, int width, + int timeout_msec); + int tb_port_update_credits(struct tb_port *port); +-bool tb_port_is_clx_enabled(struct tb_port *port, enum tb_clx clx); ++bool tb_port_is_clx_enabled(struct tb_port *port, unsigned int clx); + + int tb_switch_find_vse_cap(struct tb_switch *sw, enum tb_switch_vse_cap vsec); + int tb_switch_find_cap(struct tb_switch *sw, enum tb_switch_cap cap); diff --git a/queue-6.1/wifi-ath11k-synchronize-ath11k_mac_he_gi_to_nl80211_he_gi-s-return-type.patch b/queue-6.1/wifi-ath11k-synchronize-ath11k_mac_he_gi_to_nl80211_he_gi-s-return-type.patch new file mode 100644 index 00000000000..4085010dedc --- /dev/null +++ b/queue-6.1/wifi-ath11k-synchronize-ath11k_mac_he_gi_to_nl80211_he_gi-s-return-type.patch @@ -0,0 +1,46 @@ +From dd1c2322694522f674c874f5fa02ac5ae39135dd Mon Sep 17 00:00:00 2001 +From: "Jiri Slaby (SUSE)" +Date: Mon, 31 Oct 2022 12:43:41 +0100 +Subject: wifi: ath11k: synchronize ath11k_mac_he_gi_to_nl80211_he_gi()'s return type + +From: Jiri Slaby (SUSE) + +commit dd1c2322694522f674c874f5fa02ac5ae39135dd upstream. + +ath11k_mac_he_gi_to_nl80211_he_gi() generates a valid warning with gcc-13: + drivers/net/wireless/ath/ath11k/mac.c:321:20: error: conflicting types for 'ath11k_mac_he_gi_to_nl80211_he_gi' due to enum/integer mismatch; have 'enum nl80211_he_gi(u8)' + drivers/net/wireless/ath/ath11k/mac.h:166:5: note: previous declaration of 'ath11k_mac_he_gi_to_nl80211_he_gi' with type 'u32(u8)' + +I.e. the type of the return value ath11k_mac_he_gi_to_nl80211_he_gi() in +the declaration is u32, while the definition spells enum nl80211_he_gi. +Synchronize them to the latter. + +Cc: Martin Liska +Cc: Kalle Valo +Cc: "David S. Miller" +Cc: Eric Dumazet +Cc: Jakub Kicinski +Cc: Paolo Abeni +Cc: ath11k@lists.infradead.org +Cc: linux-wireless@vger.kernel.org +Cc: netdev@vger.kernel.org +Signed-off-by: Jiri Slaby (SUSE) +Reviewed-by: Jeff Johnson +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/20221031114341.10377-1-jirislaby@kernel.org +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/wireless/ath/ath11k/mac.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/wireless/ath/ath11k/mac.h ++++ b/drivers/net/wireless/ath/ath11k/mac.h +@@ -163,7 +163,7 @@ void ath11k_mac_drain_tx(struct ath11k * + void ath11k_mac_peer_cleanup_all(struct ath11k *ar); + int ath11k_mac_tx_mgmt_pending_free(int buf_id, void *skb, void *ctx); + u8 ath11k_mac_bw_to_mac80211_bw(u8 bw); +-u32 ath11k_mac_he_gi_to_nl80211_he_gi(u8 sgi); ++enum nl80211_he_gi ath11k_mac_he_gi_to_nl80211_he_gi(u8 sgi); + enum nl80211_he_ru_alloc ath11k_mac_phy_he_ru_to_nl80211_he_ru_alloc(u16 ru_phy); + enum nl80211_he_ru_alloc ath11k_mac_he_ru_tones_to_nl80211_he_ru_alloc(u16 ru_tones); + enum ath11k_supported_bw ath11k_mac_mac80211_bw_to_ath11k_bw(enum rate_info_bw bw);