From nobody Sat Sep 28 10:38:27 2024 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 4XG3hh0BZ7z5X8Vc; Sat, 28 Sep 2024 10:38:28 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XG3hg4dxnz47Rk; Sat, 28 Sep 2024 10:38:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727519907; 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=ecns0IU7H7lfDINptqhhXwXfJ47rDhgzTo4l2Y7JUyE=; b=pvlnZEjigxIVog8g2G7jXHzmg+Axn1K+7fvo+J+TOhhzN4E8D5LjwWLITmbjQsFXJRuk7J CEAT7ijOyPECEWsaSp6cBE/p8mMVU/7f/lAng12iB+nBNY06k80Ax8Qc28YStTHvOPJt6D UvDEsb0L49rbJYvvYQlaQc9t5MCOYiqWOgDZZoRi5yxJceHEVcZ3r+gx5hBJYp2TPfbWz2 RK5RFawERqUeddKVx5UoZH1gbxFn9eAaZFfcfm5jHCWEMOtq9XRrStb9SqvwvqblA2jiUw 7E2Q1GDu99T8l4LsoKNYHxf0hoSlW8IL8wRE9yF1jPFX9oAt1QDTLfaynSAOpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727519907; 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=ecns0IU7H7lfDINptqhhXwXfJ47rDhgzTo4l2Y7JUyE=; b=axuuKe8MqmKvpmNIT8O4D8lkVKLQ3Y1yGv2gayWOS9CReH9yp1TSYViJNK3h9AA/wzS2Fa 7710rtE8P7spBHftwK5wCOPrTgIrIStO2HE54W+FZahXl9bnkDvkiiWPzmyTYsUEzvV6bI NxUG4l9YcfogfopRlQeERgYnBHr0ALUQ9F/8iCDKzcudZDo93+O6FkSeFzyTiSkrue/2RT wFly+hTnMdL6PKZ0ruLexFb0MbqCxeCuCWyhSQZirzq2swuwdxL1Uhg7lK9mBr+vhrMI32 yQSV0RobGh7PKi07VZsMC1fkX2YTyNtSk47uuUOnxd6Y2aWSl47Sb+ZhUT7XOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727519907; a=rsa-sha256; cv=none; b=h8z6f+36rqq/6OarMwE8O3PMaHyrvNEYkth2DNzMwmfTs3A+awSrG5zh/GwoE2VvmEN1SZ oAkn9bSdwGGEh9XBQ9sexDV2NYsRC3Gf3eyd+XSAF81v518EmYciKyHlF+n0lUPfwWmyEj mzx6n6rNJzYaF1CRgpBxi9pyzBh9qt0Yxw6b7+kzEM/0evmSh0One8ueoraZgjl1kNABu3 hOp5yTzuKCyUdawkyuso2+1dkF+i18NSZPAqQRe3tbA5Eguv8JQe5Udw735HgVDeW7a9Mk 3eH6M8HScMdtHTcs74I9mcsU1PkBK+IRh8X5ENcS06+YTigjUR+zgZAhn0WVaw== 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 4XG3hg4G99zLt6; Sat, 28 Sep 2024 10:38:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48SAcRmE098348; Sat, 28 Sep 2024 10:38:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48SAcRPF098345; Sat, 28 Sep 2024 10:38:27 GMT (envelope-from git) Date: Sat, 28 Sep 2024 10:38:27 GMT Message-Id: <202409281038.48SAcRPF098345@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: f00e737be055 - stable/14 - LinuxKPI; add more defintions to netdevice.h 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: f00e737be0558f4bc8ae858783ab8cadf519ec69 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f00e737be0558f4bc8ae858783ab8cadf519ec69 commit f00e737be0558f4bc8ae858783ab8cadf519ec69 Author: Bjoern A. Zeeb AuthorDate: 2024-09-12 20:46:22 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-09-28 10:35:14 +0000 LinuxKPI; add more defintions to netdevice.h Add new enums to netdevice.h (including one which is referenced but no value of it is used in a driver so we have to add a "dummy" value to avoid an empty enum). Sponsored by: The FreeBSD Foundation (cherry picked from commit 6ed447b51a9d6cf22aae2dfba6efce3922ae6d57) --- sys/compat/linuxkpi/common/include/linux/netdevice.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/netdevice.h b/sys/compat/linuxkpi/common/include/linux/netdevice.h index 3d2b309909b4..dde3ad07dec2 100644 --- a/sys/compat/linuxkpi/common/include/linux/netdevice.h +++ b/sys/compat/linuxkpi/common/include/linux/netdevice.h @@ -75,6 +75,10 @@ struct wireless_dev; /* net/cfg80211.h */ #define NET_NAME_UNKNOWN 0 +enum net_addr_assign_type { + NET_ADDR_RANDOM, +}; + enum netdev_tx { NETDEV_TX_OK = 0, }; @@ -95,6 +99,10 @@ enum net_device_reg_state { NETREG_REGISTERED, }; +enum tc_setup_type { + TC_SETUP_MAX_DUMMY, +}; + struct net_device_ops { int (*ndo_open)(struct net_device *); int (*ndo_stop)(struct net_device *); @@ -122,6 +130,7 @@ struct net_device { unsigned long tx_errors; unsigned long tx_packets; } stats; + enum net_addr_assign_type addr_assign_type; enum net_device_reg_state reg_state; const struct ethtool_ops *ethtool_ops; const struct net_device_ops *netdev_ops;