diff --git a/kernel/0010-bonding-gcc13-synchronize-bond_-a-t-lb_xmit-types.patch b/kernel/0010-bonding-gcc13-synchronize-bond_-a-t-lb_xmit-types.patch deleted file mode 100644 index 218c296..0000000 --- a/kernel/0010-bonding-gcc13-synchronize-bond_-a-t-lb_xmit-types.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 212f7a3e399fa3f6c695f54abccda5967c697aba Mon Sep 17 00:00:00 2001 -From: "Jiri Slaby (SUSE)" -Date: Mon, 31 Oct 2022 12:44:09 +0100 -Subject: [PATCH 9/9] bonding (gcc13): synchronize bond_{a,t}lb_xmit() types - -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 -(cherry picked from commit 777fa87c7682228e155cf0892ba61cb2ab1fe3ae) ---- - include/net/bond_alb.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/net/bond_alb.h b/include/net/bond_alb.h -index 191c36afa1f4..9dc082b2d543 100644 ---- a/include/net/bond_alb.h -+++ b/include/net/bond_alb.h -@@ -156,8 +156,8 @@ int bond_alb_init_slave(struct bonding *bond, struct slave *slave); - 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, --- -2.42.0 - diff --git a/kernel/default.nix b/kernel/default.nix index da090f6..e935838 100644 --- a/kernel/default.nix +++ b/kernel/default.nix @@ -80,9 +80,6 @@ pkgsAarch64.buildLinux (args // { # Lower priority of tegra-se crypto modules since they're slow and flaky { patch = ./0008-Lower-priority-of-tegra-se-crypto.patch; } - - # Fix an issue building with gcc13 - { patch = ./0010-bonding-gcc13-synchronize-bond_-a-t-lb_xmit-types.patch; } ] ++ kernelPatches; structuredExtraConfig = with lib.kernel; {