From nobody Mon Dec 09 16:19:27 2024 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 4Y6Rrw22zFz5gTWL; Mon, 09 Dec 2024 16:19: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y6Rrw0sjWz4SWK; Mon, 9 Dec 2024 16:19:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733761168; 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=hh0ygwpshNhJ2YBwjucvbjrPs/ErNpzvNzKMlB0n5cc=; b=vUdDSNNyISft+aHalz+s62oWF0WcsWNc86zToEd0cSUuSTxQ2W8y9j6Rsh/CvmavA9v+n6 94nkmvNEuNldSq7veN/lLnGzfmSuGvphby3/7gNbQwjzRePndtcOrVXINiSVP/kJ3U2JWG oiX5EriKA46RubmGYsTjBbTClB6CWO0XZ9bbmqRXMbnIfVczWBoHC+JOHksIyyJkconG/S RKr6lJ5vk7taTSUVTB1aL8r5b2MjYQLfcZz/fgeaGY6/judj9yiM8zb1/+DAm8Wikc7Ytf 8ZDbeBpEqOOzdNuCHA9/irVuyCrd4Np+74eevhYUgkVsHqcH8oVIdCvnIAcLhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733761168; 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=hh0ygwpshNhJ2YBwjucvbjrPs/ErNpzvNzKMlB0n5cc=; b=LlsELDLvrTyFWWvGFl+Y+Q/3WcRE3GmXNghBIf/Mi86LJuWTaniM5KZ1JTIoaS1Ng9QRJW 1UazMsWlaPnrV57esMgjOpkuSUY7/sJjZ5Fa/Ilxlo1WckbOVjcDDf7chYCGsGocK2P/Y9 Mi7vMKdkRN1pK6mVSmrVoH7ZxXReVy3FdEOMeZ1i04lGEV+0SNm7TLUo0almasF0Rsbb4/ PE1cTBJVuIZNbXS89FmtL1R21OSb4AQokeNWyQqS5op5/LSmD+dfW853NEiJbVffrhQ1GW ErLumuAXkX4QIhyZD4zP0+iKirFlOT5HOO2PbFGB8wzFF/qbbSbtTWCzy7kzdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733761168; a=rsa-sha256; cv=none; b=ihyztDUA4GdfXmzgNKT8lBZQvW08m3Nqt4OpAaUFZkhHC3iczpdah3gHlMvdm9mg3nHLfF +DQZKBRmEKV9URfqp4pb7aksHCVaYrtzeAJMq6XlRRYa8+pRvrWQ7gJBbRfztKVZlv2Bll mzw/jpRNXqOEqoyBdSMq8NFBSuNjf1cKl3p27Ol6jfUk6ZTdtfaGvprRhE2WPukQUrvECk eVLCGWQwmfh8FR2UQtm6fAhfMrn2o8i01jRxbG2awSGGvv4pVaNgboyuHYecX2Nr5k/KnF wDUaL+GF4CqAMIEkZKtrxlXpZpXPMxWLwaiatTpgiQJj3RWJEbYtFrnMp6tUGw== 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 4Y6Rrw0TtzzkYM; Mon, 9 Dec 2024 16:19:28 +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 4B9GJRUF019898; Mon, 9 Dec 2024 16:19:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B9GJREQ019895; Mon, 9 Dec 2024 16:19:27 GMT (envelope-from git) Date: Mon, 9 Dec 2024 16:19:27 GMT Message-Id: <202412091619.4B9GJREQ019895@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 8e1af80243ff - main - IfAPI: make if_getlladdr() to return char HEAD branches config description git-daemon-export-ok gl-conf hooks info objects packed-refs refs 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e1af80243ff97f56918b363196832af9406597e Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=8e1af80243ff97f56918b363196832af9406597e commit 8e1af80243ff97f56918b363196832af9406597e Author: Gleb Smirnoff AuthorDate: 2024-12-09 16:18:56 +0000 Commit: Gleb Smirnoff CommitDate: 2024-12-09 16:18:56 +0000 IfAPI: make if_getlladdr() to return char * No functional change. The caddr_t is a relic typedef from C version that didn't have void pointer. In this particular change we really need a char * pointer rather than void, because some consumers use the link level address as a char array. --- sys/net/if.c | 2 +- sys/net/if_var.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index 25cad0222c06..08c59627b196 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -4888,7 +4888,7 @@ if_setifheaderlen(if_t ifp, int len) return (0); } -caddr_t +char * if_getlladdr(const if_t ifp) { return (IF_LLADDR(ifp)); diff --git a/sys/net/if_var.h b/sys/net/if_var.h index a0271cfe2a7c..83d33330987e 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -643,7 +643,7 @@ void if_setrcvif(struct mbuf *m, if_t ifp); void if_setvtag(struct mbuf *m, u_int16_t tag); u_int16_t if_getvtag(struct mbuf *m); int if_vlantrunkinuse(if_t ifp); -caddr_t if_getlladdr(const if_t ifp); +char *if_getlladdr(const if_t ifp); struct vnet *if_getvnet(const if_t ifp); void *if_gethandle(u_char); void if_vlancap(if_t ifp);