From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 895DB3C7579; Sat, 28 Feb 2026 17:39:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300378; cv=none; b=iF0cBu0/A5TUyH63fuYmTM+mbu0FDj6cUIf5qadZrMkQPn8erbzCetM4KSkh05o6MepFaWpeUwCJg2LZx8mEvImdT8FDxTvJxjmkviNwaCeerWdBlEwDzygQTdxek8brPZgogdaKYit4FeqwOo29r3XrmYqUsNwRcIQ+/kOOUWw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300378; c=relaxed/simple; bh=SmIZ7eLhuIMXWv0+9VOXp6q9bv9TM4DpcEnGvHeowfc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S91rzEQsIZkD+TyWtPkmrzx7XcRKimNQvGSQqq5sI+tVrkTAc2hADdU2L8MROM0YsNpJjPhwrJSqA5Wb5biAF2vThYwQYqHukSfoetOWha5Gy/PigErLsEsuK4taypuJkyjKvI+Z8EnKk8smYu60DBRMP0BUmocgdtEG7Uuv8fE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=p3UQYNoD; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="p3UQYNoD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BD4A7C19423; Sat, 28 Feb 2026 17:39:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772300378; bh=SmIZ7eLhuIMXWv0+9VOXp6q9bv9TM4DpcEnGvHeowfc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p3UQYNoDTtPjHQxgVc92AVBKk2IjoEVp+XQBLkVhYNaTXKaySjEYihqoAl7U5emLP q/mItUgNU60XegredbhoLszFSlEYAOLOaTKfcpp09alJDm3LK7DC/2r6VO0eeXwzlm GyaUj+MFRGyoupAOzEDcFDmUctIPBp8YtwZ3J/W90FZkqaK9Ih1glw7RBXSAybSs42 F1qoRHrzuQ5AG1O8lmLDBEn2oKJDEwt0pZZ150GoIxIo3T4YD91OiisGjKPARX7cn0 toMY57uODU3/eJT16//HaQMS3vG4j/MAd/ywNqoAOHSfeBmt9NBMl2WORttuXk4GST WHq3ZQcpRoN3A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Phil Sutter , Alyssa Ross , Florian Westphal , Sasha Levin Subject: [PATCH 6.19 414/844] include: uapi: netfilter_bridge.h: Cover for musl libc Date: Sat, 28 Feb 2026 12:25:27 -0500 Message-ID: <20260228173244.1509663-415-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260228173244.1509663-1-sashal@kernel.org> References: <20260228173244.1509663-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Phil Sutter [ Upstream commit 4edd4ba71ce0df015303dba75ea9d20d1a217546 ] Musl defines its own struct ethhdr and thus defines __UAPI_DEF_ETHHDR to zero. To avoid struct redefinition errors, user space is therefore supposed to include netinet/if_ether.h before (or instead of) linux/if_ether.h. To relieve them from this burden, include the libc header here if not building for kernel space. Reported-by: Alyssa Ross Suggested-by: Florian Westphal Signed-off-by: Phil Sutter Signed-off-by: Florian Westphal Signed-off-by: Sasha Levin --- include/uapi/linux/netfilter_bridge.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/uapi/linux/netfilter_bridge.h b/include/uapi/linux/netfilter_bridge.h index 1610fdbab98df..ad520d3e9df8f 100644 --- a/include/uapi/linux/netfilter_bridge.h +++ b/include/uapi/linux/netfilter_bridge.h @@ -5,6 +5,10 @@ /* bridge-specific defines for netfilter. */ +#ifndef __KERNEL__ +#include /* for __UAPI_DEF_ETHHDR if defined */ +#endif + #include #include #include -- 2.51.0