From nobody Mon Oct 17 20:41:33 2022 X-Original-To: dev-commits-src-all@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 4Mrpn96T7Sz4fQfJ; Mon, 17 Oct 2022 20:41:33 +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 4Mrpn962GPz45sk; Mon, 17 Oct 2022 20:41:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666039293; 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=aeM3DgTy3Dg7AN4l1d6wYMUBHfrJLbkCrbidNNYvKoU=; b=gJWrp3SuYwgX/+foHXH/JC6v5xUKNRaEIEjLYE/RRGGjwWu/laYBUZjvPqJJXNJ7A52lJz UuONumPInzJXY0SSKnJ6+K9OgTHxLyItKDN7AdSVSLkxUeJDpjiHDQ5QD3DhzH1Y7q4nll 4USYpXTikXry86iqubeyzY/R5lSRKUKeTUOsZrRehG2v/kLAspjAvLMqDAyqC6dhprivA8 z6SJv24e+ULyuK+8lLBuz6d9E1Ym/HKsNuTSt+v77R86rqiqUQs8Z7lVXq+C8IoiCGcaLu DLGc7YIWJwXpX2PjOxq8oBFdITT9JOGHgvjd67JCwUsIVeS0vRHCK1tK9v5wHA== 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 4Mrpn94r5TzxKR; Mon, 17 Oct 2022 20:41:33 +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 29HKfXaH096418; Mon, 17 Oct 2022 20:41:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29HKfXEp096417; Mon, 17 Oct 2022 20:41:33 GMT (envelope-from git) Date: Mon, 17 Oct 2022 20:41:33 GMT Message-Id: <202210172041.29HKfXEp096417@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 990d3105c4d6 - stable/13 - LinuxKPI: if_ether.h add more constants List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 990d3105c4d63c2c2382244c744e6ccd41e3c685 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666039293; 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=aeM3DgTy3Dg7AN4l1d6wYMUBHfrJLbkCrbidNNYvKoU=; b=MuSpTd8Oh1o+rPE+qD6J7Q6w4NKAAXz8Dp1b+fHwqQVaj/lomux8MCxR++AlIRA0av6v7d rx4j5MA5RRuSOK7NAsA0rV84cfQSn7IDfexLDouAZrNJlaFoiK2XLuegU5pv95h2y4EuLi FSJO61AurqlJk1bk6JSgNvbSY1i//6oK2kXhm62llI+uA3OrJg/FptQskiAK5bdMGCB+HH k6dVkXKn6Z1BdT5og2vqd9skD3wweAFnMhrshhnJxzp6SbihpVF6bC1wpSwaGQJ9dAtWNn oXkTPQJdzFDnahr7gZPXj3aopOTW+H9yVM5QtwNmtDegnIDRiwE9d8b08LHEDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666039293; a=rsa-sha256; cv=none; b=vz+wxGl1jGCXvMR1x27ndgdutbb+paxZssFkPFdIGkWqL4ErLKvhfB8CXZNz3OmposCgbS MsaNZfF9pztZf0khyWZ6j3BvjwonF7Q5Ge2WMlh7ejHvqCjJneEk49T77ztmWU2TnT3IC1 1FO598nRw7abP46vMROA0HIOgeLz5xPqEaC5hwOyCfznZqpCaSk9TIhidU9cXgOudU8C3d pTVfoJUuCIb8f47DPqrbHvTY9SJcG9NZ2pi9AYdKF+rVP3XowHPq5Q5gmpPuVbkOCkJP+C mJMshhePe3LB0Ho6WGIb+mjYiKHNqDPkTqaitENjyIbL7xuRBj/+HdcIYZxkQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=990d3105c4d63c2c2382244c744e6ccd41e3c685 commit 990d3105c4d63c2c2382244c744e6ccd41e3c685 Author: Bjoern A. Zeeb AuthorDate: 2022-09-21 19:51:52 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-10-17 20:37:03 +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 Reviewed by: hselasky Differential Revision: https://reviews.freebsd.org/D36656 (cherry picked from commit 8e30f49256e254b31fc7c25c97e608f19c268b2b) --- 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_ */