From nobody Fri Jul 7 23:54:37 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 4QyVcZ0d6mz4lWMy; Fri, 7 Jul 2023 23:54: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 4QyVcZ0CSPz3qVw; Fri, 7 Jul 2023 23:54:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688774078; 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=pTfWE9bVQEJY0HZkb91yA+uOdu07HFEBPwR3qMCptcQ=; b=SpF5QcLtbYkyxXWpKwlw+yyz0ieDm/sz9tFad1V3O5bYpiGFspg3hGyNRgmBXR3EjDL/hw EpAf0PczRSBVMNc4wIVRqimArTK8wsO7iHgrnw61rlRuhzmyTTdQSj7/Qhaahodm6ZfufY UB7ir3upqbEts+rbTWzkd9nuMIxwqp0AVwEc7rsHJmaMqptqJv11tgQ4o5fekR/dDrn2lM 6rxZ0yeQhpZrBkLtprrSFvWc9+3nsM1+BZTEUBkRGzWQtN3ZmuKWp1xqtpyR7XPB3pU6dI YYjRaj1av1xgUedw3v8nPQZF9VMMurHI9D8dmPL0wZfU3FH0+7ZFQGagxoN3+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688774078; 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=pTfWE9bVQEJY0HZkb91yA+uOdu07HFEBPwR3qMCptcQ=; b=m9QCEDnaWyBI35ZxCk1MFtDitX1or+P4VFLL76ER8jiZLU2GWw/XLmEQOUs0uQoDDTnB9P nZFILEHGY+GgU7rjxxRlrnEGstkBdYDBR7SgdChUaXSo3lmXJi+gXlW+6uTM0XhIY8fPJO +5JmQKTdMn5VDKESJaqclCL0/W55YAF+5+G6l+luf8gfua5TbIhszww+GiggYb7LOD16t4 8J4bezBbLwF/77t6gIwLjHiLLnh0BPNLhb021y9xc+l0B80EXRNgUViXExusGAoI+8kwuF 9oaLSCC7vNVX9QLAKpSl8OnlQAz++EAU5yEymr102h3J6/WJVtu2vXl6fBucKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688774078; a=rsa-sha256; cv=none; b=Hwgb4ROWclRvkIhUmH3UFn7nDeqpmcAFsvazlToYUmOYYI/ePqFLVIxiYFhM7kp/bLgszN V8RtZruRI4oCPtNOMn26vd5RsPupHTRhh8RpcD8SYMVFduTkw6rY+5Ge4CH5gs8sNStUIT 64W97bQ+ivnQ1JiVdqT9ovagrtxsswCMfgfmkvLhTr3iHjFof9sOsicfHCF6aIwjzHZsDz r32lZ6+q+uqFgw1FhWChp6r+0Gd/4vqQnMrceNJ+9C9QV10+aLJt5wbnkG5+ZHgaOQzOpY pHaJsBzues5cfTvc5d67TqVasPe/lYhe8w2ssWLZXZJw0bxdqdBL4fWkseQIlQ== 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 4QyVcY6GsxzyyH; Fri, 7 Jul 2023 23:54:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 367Nsbw6010152; Fri, 7 Jul 2023 23:54:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 367NsbXj010151; Fri, 7 Jul 2023 23:54:37 GMT (envelope-from git) Date: Fri, 7 Jul 2023 23:54:37 GMT Message-Id: <202307072354.367NsbXj010151@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 5684c8783b64 - main - qlnxe: Add missing #ifdef INET to fix amd64 LINT-NOINET/NOIP builds 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5684c8783b64e33f0dab058126b36776adcc8e82 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N 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: