From nobody Wed Jan 04 21:03:38 2023 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 4NnMXB5rLMz2p6Hb; Wed, 4 Jan 2023 21:03:38 +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 4NnMXB56zWz3G3q; Wed, 4 Jan 2023 21:03:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672866218; 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=iS7flkTHZlXvH/bf+LbopnMyrey9Vqvfyi7uZNoPlM8=; b=cnrOBpnPUWOB6NB2HvMBJoCp/gi8sHAfZ6y184rYgyVQOCGwkeYMyZYAjQs8VOFyHKT3T9 6MaP35Y9fpJdQup70PutrrnxBBzrkLc5sYSz8sSipMIvAkh/NvAJF08yTu0nKnKNutLRx+ cFYMFaeK1M9RAC/ZzQJXSyNc6KGyC893P48POMykS7TMDfwkvuAlhXq/JpfuAOvP1yw5dO nqyfJ+vxHFvy+rrgOex0C7a9gFAyruwg4Z7GKDuGK9voj6P/7jkiTS3hvZby0asE1G0ZmG 3ihXml4byhjHcKzXENW9S9RAXbK5LP3V10vab7IHUuwAX36yw1Ewvc2zhRIBKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672866218; 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=iS7flkTHZlXvH/bf+LbopnMyrey9Vqvfyi7uZNoPlM8=; b=Vy+6vfx6FpZwMVXv59SrqwK+OkAV+2RlTmgPiiDdfyU22NMoZnA5TnaDH80X4foQClLlMr vkmngWI3lYA0aCcsrWCin4yKLqS+99PTydt9ZHTyR0Drjn2xPIrm9PAIqPt0TSdXnz4Nf7 IktAWrJ2cWEH6XTTqryd7s1CgUgrdE9D6xo4wFnDwS+VkimwKMHTo7BOhdG+UIAFZuCjKI +tjhaXAx+zjyJnJDRMl8F1B7dL72IkbAMlesdSVyjXTLyd2wY6UAtEhLjHgIrMvRn229Ua pv7eCqFODrpehd+VSJIKhequY5m0xalHFNK1Vk3vccoK9YcUdOLHCj5Z0WcT7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672866218; a=rsa-sha256; cv=none; b=hkat1aOiMhJ6Pe/qo+ZmP8cSFz6hWn10yyve16bCzQRMdR9bqsUd6B5r/+fZhrKwOL+cwK 2DD4QI0aq5OfAHEZjmBjtNNBiTsbbeUTLds7Op3epzlZVKQVuWWcFXkvcYbUz+0FLBnm+5 hcxFAvL3CS+qCko+nk2eht+qCG9X4u+J9eyOK0qBlhJ5EKHbJOZihkZggx/61c5eX+xh1p +cCkao6JkRTrc4sDbmubgM/U9+0HKjwvq/icX0mzmXXk5+BYzsT/lGxKTFArISqfp8Dwt4 /Piyy2Lek+Mzxtc1MeK+3HYUI959E+e+SYZui0dL8odTROsZyJC3R6FHOB2iHA== 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 4NnMXB48mJzQJj; Wed, 4 Jan 2023 21:03:38 +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 304L3csF045461; Wed, 4 Jan 2023 21:03:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 304L3cdv045460; Wed, 4 Jan 2023 21:03:38 GMT (envelope-from git) Date: Wed, 4 Jan 2023 21:03:38 GMT Message-Id: <202301042103.304L3cdv045460@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 11905a0b4e78 - main - ifnet: Expose if_t to userspace 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: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 11905a0b4e78b13959f89629568ffeb4786f912a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=11905a0b4e78b13959f89629568ffeb4786f912a commit 11905a0b4e78b13959f89629568ffeb4786f912a Author: Justin Hibbits AuthorDate: 2023-01-04 20:56:31 +0000 Commit: Justin Hibbits CommitDate: 2023-01-04 21:04:05 +0000 ifnet: Expose if_t to userspace should be a kernel-only header, but it's included elsewhere. Until that's addressed expose if_t to userspace to fix the build. Fixes: be4315dcbb8 Sponsored by: Juniper Networks, Inc. --- sys/net/if.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/net/if.h b/sys/net/if.h index 85c217a888bd..888e7d5d7320 100644 --- a/sys/net/if.h +++ b/sys/net/if.h @@ -651,18 +651,18 @@ struct ifdownreason { #endif /* __BSD_VISIBLE */ -#ifdef _KERNEL -#ifdef MALLOC_DECLARE -MALLOC_DECLARE(M_IFADDR); -MALLOC_DECLARE(M_IFMADDR); -#endif - /* * Opaque interface structure. */ typedef struct ifnet * if_t; +#ifdef _KERNEL +#ifdef MALLOC_DECLARE +MALLOC_DECLARE(M_IFADDR); +MALLOC_DECLARE(M_IFMADDR); +#endif + extern struct sx ifnet_detach_sxlock; struct nvlist;