From patchwork Sun Sep 22 14:50:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3513 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 3CEEF40D67 for ; Sun, 22 Sep 2024 16:50:21 +0200 (CEST) Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-a8d1095442csf255069766b.3 for ; Sun, 22 Sep 2024 07:50:21 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1727016621; cv=pass; d=google.com; s=arc-20240605; b=Njmq5Ge/qOMr7Y45og6W467IWSgajpsjZQZQwY8S4I8w+n472MGxGXeZ6Vif7E4Arc 78uZkPgByDlsxQ45S1540MqjJsrs+BCbuJ7NyidDLPhu6mvijmtJOeFQghkkpKJHzsUm BgWjnN5NMYGx7tVA/bw1IIqj1z8OA8DnBFv8uE82BvqkJLeyTidR1MQVVCugkXeCmKQM o9BpsZyvdg0j7nc2Ucb7eZKDuFASNjSTt++207EW+nWe6HqJQ4ckoijpPrKWcluIkd8h Cn4ZnDiFcik9WtgVY6f+3Ao5txq4yUKho6BgzDRUi09Vv9/7dqYu+XOKqiSSctDFNBgq bYFQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:message-id:date:subject:cc:to :from:dkim-signature; bh=1pFEE7Fbi5UqlKhWUPnPzHUET4DJO7pibeANPJR/+mY=; fh=FkFU0Zk7LlmJP+lV0aMcyM1kSjsnW7yVgodWrcrcbPQ=; b=bgzavD1qw86O5Yq082d/BogCMFETn9+pxfjI/nJOWiWa2+zVLRRq3fhJTviomSizEE G3jG/ynhAFb5BC1ihpFFMx0pf0pgIEjEBMTpUlVJN/A1KxUxqUL0KD3eAx4JNqhjejE+ eGAzemp9QrAO3r19fYFI09edj3ZxUwWjMIaF51NI3ey4jbFZo92cMmV3nSnGXGJJY/43 CI1h6pYZNKY/Ns+cE2P4UYfLpeyvMhldaLPXF38BPHfHUhNp3Yjo577TfMlY3B7yzK4/ bQTsyXO8sk0NdYyRZ/SPmxPUPODZ5MY1dLemtw/iU8OFf2ozxugeDH5mmUrooseE0bHC YWCA==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=ORB9Og9z; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1727016621; x=1727621421; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :from:to:cc:subject:date:message-id:reply-to; bh=1pFEE7Fbi5UqlKhWUPnPzHUET4DJO7pibeANPJR/+mY=; b=Tvr23UEjhA6ls+CLH/sXZ3vKNFaW/2EJ1XtAJvNzosLzfCSl/wxSHBnRox6LhtnqZZ xMF0isgqYKAmzoMJwvbTTIdoSbXwo27vYxJHoXsmNc21hlVpycUuTDJ9qIocM0d6nkl3 VfAlSviLi1de98CQJUBD6R+pSncl77Nz3LgNg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727016621; x=1727621421; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=1pFEE7Fbi5UqlKhWUPnPzHUET4DJO7pibeANPJR/+mY=; b=p3Ji2Ei5RaRvwIxccYslkX9aF3Cs/KAJGFTVQDncugy4vw53RwaQwKzoJfWBYh/TcG gDtiqd5vBe2bTV9U09vb5GtyQfrjf8zomxuoz33pv3Zjsv6Gu2azYTImMHiMx0MiWabQ gV7VkIgw4LOsrPS93zG6pqErIcQUGo/jpLfxjJibfRoW99RmaeWKL5ETGnhjRki692Zx 7AeDCRiINZwtKqHRnrDX0xeehSF+GnoUEuRRwt/AmRH72mPHr02tN73tgvlAoKyn8bhI QHpid/8l7OmmYv8gZv+2E10MewsfLRcvVwCEGMpc1OgrjAhE5Ksg6DX8GLgJtWl3/au0 1x8w== X-Forwarded-Encrypted: i=2; AJvYcCWt70IIGMkVTKlAuQYbvsXobZnyXQU1u2gb49tKR1vUsQ69jVRikZegtVYSg9vFjO1foBpOIu2rFOUvvHF0@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0YyzYeTNsjbeOzeyx6iH58Jkkwm7mZqkgpW2/720opIqsfWdNr+7 nuvdQbnMp58so8PCg8jCw/qTq/AHCY45t7xJGs9/HeofOVeXt2/XxxQZK+IREt3Hww== X-Google-Smtp-Source: AGHT+IGJ47+Q3OzoW2nMOhDCLI0sq1HfzAVGaVgtcUsEAP5gBj5WT5wx8T+62xq9y9bz261aa8ml5g== X-Received: by 2002:a05:6402:4409:b0:5be:fa68:a239 with SMTP id 4fb4d7f45d1cf-5c464a3a9f1mr6471351a12.13.1727016620711; Sun, 22 Sep 2024 07:50:20 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:1ece:b0:5be:ea4f:8c6d with SMTP id 4fb4d7f45d1cf-5c45994d0adls498264a12.2.-pod-prod-03-eu; Sun, 22 Sep 2024 07:50:19 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU6QrHuJ8A7JgGQbVocU/254OQrdbTYArmZRYvNs/OA4XF24P6kvMpFMndyWFC6bkW21r/8VlkSVCEQP6rW@amarulasolutions.com X-Received: by 2002:a17:907:7ea8:b0:a8d:4db8:9eed with SMTP id a640c23a62f3a-a90d5144b59mr963634566b.51.1727016619124; Sun, 22 Sep 2024 07:50:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727016619; cv=none; d=google.com; s=arc-20160816; b=WHJrkuUU6tF7wncagT/V9Cna+Xbf0QlQJBEJCKOxB6Hx4qv770ly0cPfmJREfrPN9X X2lH2fuHSWl0GWm7uHJ0P0jfeSnToZSLQqqTN8NDlQQVyD3t4PvGIvRLJvXg8bh8FH1B HmdJV5wBOjQ+dajatuGg72PpUDpGadLKpa0g4xfdjlV699g9+at1NMdx3KP6ePaShYGW X3ZvXNTinEa6rDcDQt0CaqdW5RHTlzqu88vFEHJC3oAqtbsNFqEW52uSTwEN/fOBGp2X jzTSCg9cUb2Y1e6pDmkp8oD9gIl1quiXfQmgXL1Kl+48urjFpYGNZOx48R7KpCPpQPJ2 DqkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=3d944BDKuY8b/yUPC5xNbCL96du/ssM/tVVGCvZ3aCI=; fh=uks2w19u0Qr4eYasVfLVKCLD514oKfcsJyPP17/zM9Q=; b=x46cm74VjVYzx68tB9FCrCuR8wDw+p0mVrlCvY/2o0a0Oq6nABqOD5+6bxrocgJxdf g2i9kObuDNWp+M+IBR7/R26UxWj+xjXwwCnDCj5289hE5SIGJpSk7SSbTf5boQ56jzeP a+7cE258MEvHnc7ope54UcFufKBOtofT2NAoZc3/HsYsh110nckVe9eQHvhb2siAa99K dnN+dkToOIIkCqsVE4MDEIZPQOFnNEF6xPyenSzoh8DK4yHRqBi6yVGZK3cd/YGu7sv3 JrCMUlLl01qijpUykX6H3/rWPP1dXX5LxzOaCsbFqGwQcvdhuTxkj/wtQLWP+9m8tJcM 3Z9Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=ORB9Og9z; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id a640c23a62f3a-a90612e189esor683320266b.18.2024.09.22.07.50.19 for (Google Transport Security); Sun, 22 Sep 2024 07:50:19 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCU5qC4VHu+oroIkX5PDx5DZ6/WFyWpXfyyzYWN209DSGaJLZFppuumJOi7fugO8DPUE5nEQoeLuCzBf5Lmm@amarulasolutions.com X-Received: by 2002:a05:6402:13d1:b0:5c5:bebb:5408 with SMTP id 4fb4d7f45d1cf-5c5bebb5afdmr1535849a12.6.1727016618419; Sun, 22 Sep 2024 07:50:18 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.homenet.telecomitalia.it (host-79-20-102-52.retail.telecomitalia.it. [79.20.102.52]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c42bc8907asm9724838a12.85.2024.09.22.07.50.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Sep 2024 07:50:17 -0700 (PDT) From: Dario Binacchi To: netdev@vger.kernel.org Cc: Stephen Hemminger , linux-amarula@amarulasolutions.com, Dario Binacchi Subject: [iproute2, PATCH 1/2] bridge: mst: fix a musl build issue Date: Sun, 22 Sep 2024 16:50:10 +0200 Message-ID: <20240922145011.2104040-1-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=ORB9Og9z; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This patch fixes a compilation error raised by the bump to version 6.11.0 in Buildroot using musl as the C library for the cross-compilation toolchain. After setting the CFLGAS ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) IPROUTE2_CFLAGS += -D__UAPI_DEF_IN6_ADDR=0 -D__UAPI_DEF_SOCKADDR_IN6=0 \ -D__UAPI_DEF_IPV6_MREQ=0 endif to fix the following errors: In file included from ../../../host/mips64-buildroot-linux-musl/sysroot/usr/include/arpa/inet.h:9, from ../include/libnetlink.h:14, from mst.c:10: ../../../host/mips64-buildroot-linux-musl/sysroot/usr/include/netinet/in.h:23:8: error: redefinition of 'struct in6_addr' 23 | struct in6_addr { | ^~~~~~~~ In file included from ../include/uapi/linux/if_bridge.h:19, from mst.c:7: ../include/uapi/linux/in6.h:33:8: note: originally defined here 33 | struct in6_addr { | ^~~~~~~~ ../../../host/mips64-buildroot-linux-musl/sysroot/usr/include/netinet/in.h:34:8: error: redefinition of 'struct sockaddr_in6' 34 | struct sockaddr_in6 { | ^~~~~~~~~~~~ ../include/uapi/linux/in6.h:50:8: note: originally defined here 50 | struct sockaddr_in6 { | ^~~~~~~~~~~~ ../../../host/mips64-buildroot-linux-musl/sysroot/usr/include/netinet/in.h:42:8: error: redefinition of 'struct ipv6_mreq' 42 | struct ipv6_mreq { | ^~~~~~~~~ ../include/uapi/linux/in6.h:60:8: note: originally defined here 60 | struct ipv6_mreq { I got this further errors ../include/uapi/linux/in6.h:72:25: error: field 'flr_dst' has incomplete type 72 | struct in6_addr flr_dst; | ^~~~~~~ ../include/uapi/linux/if_bridge.h:711:41: error: field 'ip6' has incomplete type 711 | struct in6_addr ip6; | ^~~ fixed by including the netinet/in.h header. Signed-off-by: Dario Binacchi --- bridge/mst.c | 1 + 1 file changed, 1 insertion(+) diff --git a/bridge/mst.c b/bridge/mst.c index 873ca5369fd6..c8f7e6606c3c 100644 --- a/bridge/mst.c +++ b/bridge/mst.c @@ -4,6 +4,7 @@ */ #include +#include #include #include