From nobody Sat Jul 08 19:27:01 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 4Qz0dP31RCz4mBt4; Sat, 8 Jul 2023 19:27:05 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qz0dP28wkz3GZM; Sat, 8 Jul 2023 19:27:05 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688844425; 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: in-reply-to:in-reply-to:references:references; bh=MmQcljBPgzrMM/J3sCNLnv6SRsfcjcjbSibOnCssLpI=; b=SFb3w/0GN5x+4PveMN1agYnbrqZWLFAHGBlR/vRKsUVZGwH/+S5ww0WfRawOJjIaxSVtCY hssdDMWIEeyF+u63ow1hmSDCigk7FiIdqcnKpf5uAxxLSyUy7KFQps386wnbps5mokIXSL IXDmDXMnniYrHf90CvuP3jmuD602tWZx8ewMdoNz0SuUcFlGKn9SAwT+SAOW2pPmNcFngd iOqQMS6zmMxN+WTAFYqbjbmv/w6XXtYVQwbxW3Q76f7IerVE56UDaZPkHhPpfgt6NUSBc/ G6GIAdHmWjUSuk7YFaeEZtS6T7BjMP0O8/dtAP7HfGhaJqohozS5I6dpfzmrsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688844425; 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: in-reply-to:in-reply-to:references:references; bh=MmQcljBPgzrMM/J3sCNLnv6SRsfcjcjbSibOnCssLpI=; b=dR/8P7sxJj/XbqfYBqTbgbSrb4HFqIbbT1n0WhtlkntlbAzfDNby2k+Uh3i3iTFexpHkkp lpwvqOVdtPONFUnmBZHmORNNCuBcKcXEMsfouUShSQxaSD6E2DUfJEIzutQ1AMsO8hxixL WLa4DUu1Hb+FihGlspaplquF+OJjEo21mKR+GRZQayBDWMPQ2aXepdOEPmQTm2qQQTNC+d fAkfYscFmk/FRRxdc9NvzttcLi6uN11+2tpFasfY408rWYTRo/PLUGlfYPac7BcOGnvexC JlkNmckutwrAqEMRTBCZUX6HVMJ1XE5XdcWPztpK+Q+23lvCIPC0dgEJVqD1GQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688844425; a=rsa-sha256; cv=none; b=MjywFPrWUYUpSEXP473kc/IlsxDwa2aunbRtWMgwjuFfaV2bG9XEqv9BoSMkXbNs64YApL x94bu/UML1lLz3txIj/vcJh5T3jkNNKLOWw2qPfKnwIE1Cf8U/kuNtkb6+5xP1J8l/oyx0 FvOAYeBMB9D3tH/42zCLZ3/i/RFLAgvLSirUQSmhk3vSXVgmrYBVxNjT3vEXE/EGUgq1Q6 7/shsjg+XH+gdQuUebzh8GO0JSoNZWvNCIvCdkyQ+0VG40HA9NKb0DqxT70lK/0iTH3rk+ HwPZvX8NnrQPI9FnyOX2oXYRa6PKkHHqQZrM2bGeJvfHHj5xqYyyvBpOU73/Mw== Received: from [IPV6:2601:648:8680:16b0:4145:5d2:5e8b:6dd1] (unknown [IPv6:2601:648:8680:16b0:4145:5d2:5e8b:6dd1]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Qz0dN58VNzLF4; Sat, 8 Jul 2023 19:27:04 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Sat, 8 Jul 2023 12:27:01 -0700 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 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: Re: git: 5684c8783b64 - main - qlnxe: Add missing #ifdef INET to fix amd64 LINT-NOINET/NOIP builds Content-Language: en-US To: Jessica Clarke , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202307072354.367NsbXj010151@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202307072354.367NsbXj010151@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-ThisMailContainsUnwantedMimeParts: N On 7/7/23 4:54 PM, Jessica Clarke wrote: > The branch main has been updated by jrtc27: > > URL: https://cgit.FreeBSD.org/src/commit/?id=5684c8783b64e33f0dab058126b36776adcc8e82 > > commit 5684c8783b64e33f0dab058126b36776adcc8e82 > Author: Jessica Clarke > AuthorDate: 2023-07-07 23:54:07 +0000 > Commit: Jessica Clarke > CommitDate: 2023-07-07 23:54:07 +0000 > > qlnxe: Add missing #ifdef INET to fix amd64 LINT-NOINET/NOIP builds > > The approach here is copied directly from qlxgb. > > Fixes: b0d3d44dfe63 ("qlnxe: add driver to amd64 NOTES") > --- > sys/dev/qlnx/qlnxe/qlnx_os.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.c b/sys/dev/qlnx/qlnxe/qlnx_os.c > index 135aea62c05b..e8bb373fbab4 100644 > --- a/sys/dev/qlnx/qlnxe/qlnx_os.c > +++ b/sys/dev/qlnx/qlnxe/qlnx_os.c > @@ -2634,7 +2634,9 @@ qlnx_ioctl(if_t ifp, u_long cmd, caddr_t data) > { > int ret = 0, mask; > struct ifreq *ifr = (struct ifreq *)data; > +#ifdef INET > struct ifaddr *ifa = (struct ifaddr *)data; > +#endif > qlnx_host_t *ha; > > ha = (qlnx_host_t *)if_getsoftc(ifp); > @@ -2643,6 +2645,7 @@ qlnx_ioctl(if_t ifp, u_long cmd, caddr_t data) > case SIOCSIFADDR: > QL_DPRINT4(ha, "SIOCSIFADDR (0x%lx)\n", cmd); > > +#ifdef INET > if (ifa->ifa_addr->sa_family == AF_INET) { > if_setflagbits(ifp, IFF_UP, 0); > if (!(if_getdrvflags(ifp) & IFF_DRV_RUNNING)) { > @@ -2654,9 +2657,10 @@ qlnx_ioctl(if_t ifp, u_long cmd, caddr_t data) > cmd, ntohl(IA_SIN(ifa)->sin_addr.s_addr)); > > arp_ifinit(ifp, ifa); > - } else { > - ether_ioctl(ifp, cmd, data); > + break; > } > +#endif > + ether_ioctl(ifp, cmd, data); > break; > > case SIOCSIFMTU: Probably the entire SIOCSIFADDR clause should just removed. ether_ioctl already calls if_init before arp_ifinit and most ifnet drivers in the tree just use ether_ioctl for this case. -- John Baldwin