From nobody Thu May 19 22:58:26 2022 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 853221B31262; Thu, 19 May 2022 22:58:26 +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 4L44yp3Hdpz3LDS; Thu, 19 May 2022 22:58:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653001106; 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=yHkUzb9510xzkftxoSbe/135tQFfOSHWsCIZf53P94c=; b=ku0rx62PJyMtgX/5S6UnEI8G93mdY+AjeoIZMsyOjYgO9lBFF7uwELl78MAEcLHlcIsuQa EELeHCKQfNz9vmvDb58Uq7uIc8R2n3CuHkHwJ9xSFx+9MKfU49+EICDtLKWfDVheEePI1K dX+uhj4nBcxk2ixA7sM6AXoHgOM4aAbSfkh5eBwJ9hwPeK52OCnVtyUIIZkbLeVtF+m/LB twENrLygHWMEOCfYDxdul4rquZyVXlZMlnktZnB5mmt+s+rXlrMGdH+7rOOZQf4/MySbHW PGe3I9WFzhQNV3vnhyJ9o3K/3SJpoZbCxcSCuYTXS1JolnTJvNLxqUkfN4ZQlw== 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 5171326949; Thu, 19 May 2022 22:58:26 +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 24JMwQLf053246; Thu, 19 May 2022 22:58:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24JMwQYJ053245; Thu, 19 May 2022 22:58:26 GMT (envelope-from git) Date: Thu, 19 May 2022 22:58:26 GMT Message-Id: <202205192258.24JMwQYJ053245@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: 87c5ff0648a8 - main - cxgbe/iw_cxgbe: c4iw_zero_addr should not use IN_ZERONET. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 87c5ff0648a8e88b71a66994e1f9ca127fd4ed83 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653001106; 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=yHkUzb9510xzkftxoSbe/135tQFfOSHWsCIZf53P94c=; b=GVr6LTR4cuxbAbYOSNpANL7Em8A0/g8l+f+PsJTnKbEgcU+u3QWBWw+gnurLVF6rB2RAsd NOeJ9kDzBawgXW9RtPF6ZyXKZYgp4zX5ojtBr9wF2LMtZcNonWVW+ygQMfzlIYw+2zht5V n2eJiET3bHZIwSpbLIZ2NIXZPMgJtHsl85L2GxLansWtr+9+98P5YJET9tH65s8FBYNSIh jYTkSr34iiHABbVFYVm1W3Gzgwfl3DGTkMx4uA0N07vhjgrVKRiPuG1ta2u2t2pxroP84p i8MMEpqvyRVkLPF9L4LkvKQfVD9Wc70KVh3HAjLpEZ2OqYsOidDLLuWnuk9cJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653001106; a=rsa-sha256; cv=none; b=AmUz015BYqg3n9mLWAmwr7mPSNViWlmSBSUHrXZCJySJJTp1FgUU85s3IoSlUuE3GR/gHe tQej5yb0BV4Kghndxy2PrcHdKmbRjFmtN5Pwa91qRR75fZpkQhb1GW0gxza1GVtEcooBB0 PLHrDDLgZfBjc/KxPlJYELBfQd/r6Abqy8OfjsJmByVNVBLk/tCR863ZVbUp+mtTrp1MDS ukUtw5qM7A60j+nfHZWLYXYgJ9Gaq10N43d7RkS/Wr60zrQibSjmo6aUoJx2uA10SKM+eO UEszyJkhxVdxj1bPBpdPUSploP4XHBNvZrl7MDLewCzKDnpf6u7VMa+gGGg+zw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=87c5ff0648a8e88b71a66994e1f9ca127fd4ed83 commit 87c5ff0648a8e88b71a66994e1f9ca127fd4ed83 Author: Navdeep Parhar AuthorDate: 2022-05-19 19:25:30 +0000 Commit: Navdeep Parhar CommitDate: 2022-05-19 22:55:08 +0000 cxgbe/iw_cxgbe: c4iw_zero_addr should not use IN_ZERONET. c4iw_zero_addr is supposed to check for all-zero addresses but was using IN_ZERONET (which does something different) for IPv4 addresses. Fix it by simply checking for 0 as is done for IPv6 addresses. Reported by: karels@ MFC after: 3 days Sponsored by: Chelsio Communications --- sys/dev/cxgbe/iw_cxgbe/cm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/dev/cxgbe/iw_cxgbe/cm.c b/sys/dev/cxgbe/iw_cxgbe/cm.c index 93d824730735..31a401c8ef48 100644 --- a/sys/dev/cxgbe/iw_cxgbe/cm.c +++ b/sys/dev/cxgbe/iw_cxgbe/cm.c @@ -938,8 +938,7 @@ static inline int c4iw_zero_addr(struct sockaddr *addr) struct in6_addr *ip6; if (addr->sa_family == AF_INET) - return IN_ZERONET( - ntohl(((struct sockaddr_in *)addr)->sin_addr.s_addr)); + return (((struct sockaddr_in *)addr)->sin_addr.s_addr == 0); else { ip6 = &((struct sockaddr_in6 *) addr)->sin6_addr; return (ip6->s6_addr32[0] | ip6->s6_addr32[1] |