From nobody Thu Sep 22 16:16:30 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MYL4t74dWz4cjSq; Thu, 22 Sep 2022 16:16:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MYL4t6HvTz3P7s; Thu, 22 Sep 2022 16:16:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663863390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iXnnfwhqpnkLN3O3zRj8v4GD2G/lZUqiKiefYdTMkDU=; b=fJugvrQKCIOEdtZAvWk2cEqk1mONrTNeiihJnZCmEXtxmLVai3BznifLIPvzseWze5qu/H oNoiDBVA7cSm4KkyEwpdcoc6AmxR80e7wEV7v5w6HL9gKLLnjp4X4gK3jcX8pX2EkR97tk yYI9oWYPqqFUnXxZThS6ZPjySoyYx11sGHgTtaPCs8hLz4I4SLNlvzr869t1Fof8s8qmZf UAm1eesmCV8dSSzau5UfX+UUsQEOLdhJPp/gL0Gd+Y7KL+BF8sNflszS463QNqFnRZTQrS xhnuRs8iy3mjCauKVktVm+eGOuE38tpLHZdfxjQ3ETNjYbn+viwsCGXICERbxg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MYL4t5P3LzSGW; Thu, 22 Sep 2022 16:16:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28MGGUC8050445; Thu, 22 Sep 2022 16:16:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28MGGUPo050444; Thu, 22 Sep 2022 16:16:30 GMT (envelope-from git) Date: Thu, 22 Sep 2022 16:16:30 GMT Message-Id: <202209221616.28MGGUPo050444@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 8e30f49256e2 - main - LinuxKPI: if_ether.h add more constants List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e30f49256e254b31fc7c25c97e608f19c268b2b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663863390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iXnnfwhqpnkLN3O3zRj8v4GD2G/lZUqiKiefYdTMkDU=; b=bYvDWqbc6owI3aolrgwTYQy40cICePZWhvb/uvlqdiAM80PszlVzxmTfSHFr3vBQiNQLKs QfIj/XWhRFVdSI7eOrfLiAUOmFc0ScZDiNbg4Dp7NUZtdtD5Oto2D50oZr0uDNeZWzJNON qeBIu55Fjz/ymMOQYOZIEG2t9rfnMmwC3sPHiWyK/bwgMZv4IizuhFs6DdZ1jscF5ueMkW xfb8t5Ms/Qvvl96xilex+J9bYBrbHa7eDGHUnndKRvO3hwTpDSw7at+OeJOtlcaDlKgdb6 z12CmBeelHfuCYYFjFP8A9I2pIhW5fHPXCqAJw0FF5I+oryJsuJLo6k05D86SQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663863390; a=rsa-sha256; cv=none; b=sVXYi/ZXJ8wwwrvlX9YcHV+Sp8qtVvhcbNIsVRS/pL0IuAKwrymrmxFy0qq/RngHCX32bK JuH4xte44THWLGJkHunF5Q2XnPEvEa81OBgve+BxKHqhilNTH+BDD2uZSEQi5L9QoiaScz lm+PkensyrhoJdyxi9HBm20n2fezpf2+fNgVEDdAPK2g7B3iiM2BHDVrGA5iZOBY9OXuy7 C3IpAvpHDKdwzg8cp0WPLAjJq+X+zq3+6oekr7geDGm0Oz2D1sQmWdgAHSSOAG8KyA53/I 31zBv2M3M+GSMj1VWlHt3HZKFuQou6qyGLXuYshjYSDNYpiWUejSxDz0vOiblQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=8e30f49256e254b31fc7c25c97e608f19c268b2b commit 8e30f49256e254b31fc7c25c97e608f19c268b2b Author: Bjoern A. Zeeb AuthorDate: 2022-09-21 19:51:52 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-09-22 15:10:04 +0000 LinuxKPI: if_ether.h add more constants In addition to the ones added last year add more found in modern drivers. Sponsored by: The FreeBSD Foundation MFC after: 7 days Reviewed by: hselasky Differential Revision: https://reviews.freebsd.org/D36656 --- sys/compat/linuxkpi/common/include/linux/if_ether.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/if_ether.h b/sys/compat/linuxkpi/common/include/linux/if_ether.h index 178b778ec736..c27583e62ebd 100644 --- a/sys/compat/linuxkpi/common/include/linux/if_ether.h +++ b/sys/compat/linuxkpi/common/include/linux/if_ether.h @@ -4,6 +4,10 @@ * Copyright (c) 2010 Panasas, Inc. * Copyright (c) 2013 Mellanox Technologies, Ltd. * All rights reserved. + * Copyright (c) 2021-2022 The FreeBSD Foundation + * + * Portions of this software were developed by Björn Zeeb + * under sponsorship from the FreeBSD Foundation. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -55,6 +59,9 @@ #define ETH_P_8021AD ETHERTYPE_QINQ #define ETH_P_PAE ETHERTYPE_PAE #define ETH_P_802_2 ETHERTYPE_8023 +#define ETH_P_IPX ETHERTYPE_IPX +#define ETH_P_AARP ETHERTYPE_AARP +#define ETH_P_802_3_MIN 0x05DD /* See comment in sys/net/ethernet.h */ #define ETH_P_LINK_CTL 0x886C /* ITU-T G.989.2 */ #define ETH_P_TDLS 0x890D /* 802.11z-2010, see wpa. */ @@ -64,4 +71,6 @@ struct ethhdr { uint16_t h_proto; } __packed; +#define ETH_GSTRING_LEN (2 * IF_NAMESIZE) /* Increase if not large enough */ + #endif /* _LINUXKPI_LINUX_IF_ETHER_H_ */