From nobody Thu Sep 14 21:21:10 2023 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 4Rmqxf6ypVz4sRCw; Thu, 14 Sep 2023 21:21:10 +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 4Rmqxf6Zghz3CDC; Thu, 14 Sep 2023 21:21:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694726470; 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=W1flHhotgU5T5wRMYnk4R3f/ETvN/BeclftPvWGEeoU=; b=kSAfuZBfijeCukQisFQO5AwORWqva/gvEPVirgn/euFsdJ5fKcaLbvmkLCtsBP8yE7CS5l I9SJdSuaUHzj25SSIfkUIer6RK+H9zmnGHbgUp7jEqi6mF8hRHa3IfpmTrjeqTWMott5qq xZL54oI484i6ylHMyRQdX+lBKcRFBrp6+9gBRrXxhsNnaGs6EF1HdP+ojB94M/Q+DE6x/d 9ETfZdCjTQGT04QqRX0NgocLsy4346l0u8pRr0X+NpzkDWGud6QYVRQycAq0cwxil0+paG cQQnDBeSjEw3s1gDlycaGo8s2Pzo0s2X9oLWOcF3w/B5hKxQtH3bpsxSA6RsZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694726470; a=rsa-sha256; cv=none; b=yDI+ZLgPGDLh5Bki5a+E4dE8XPMFfgjcJOSj7ndAvlYfV32F9ZMxFt2Fjjzwf4fUKsJ+1b jUmqOc8OLUxpvFUFZrktZYA1YplOHfBBp53ZJ2Y+IAOiGHY2p9x2a2BwwySQk3i6iCzAsq KeUyO4phzCfYMuwEbgVGsEKJCPez0d19RhXswP08dItKzi80XR/tRfFGr73jJzVQWTVOhV XXjAMR3mG/vIm8e2OLgjE1DkyS5+P/053mZ8AGnZ5uby2dZrC2f9a5xqjm8pacg3RREfz9 gOV7+Qut6jp8MnCFVa+gFuOAS0uOQdVAgDE4d4CkaRIuvAzTwse/AyFzkjwpew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694726470; 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=W1flHhotgU5T5wRMYnk4R3f/ETvN/BeclftPvWGEeoU=; b=EErRaZxFkS0OU6HiigLGf2mnagQnE3aJ+j+JNOflB37txZ3dFPaJfSix3AIAMYdFEzXW1T 6eQv3R3FxzcMVkq5ReXRMX2eG8hecPZCJY6ASHvnqAqo9KIOMAzdZbeYrTQf4SSimJpqs+ HXS2BIM+aLGmh1J+o/Y7NYEaDi7gkTwzrX6uQYDAvFi1H7RdaFiaJ8xsQQlwBXrsCS67ll 6VyKwlenakmZb875EM7MJiaR7wFIpbVBF4DkQMI3iKlAli/ypG0TzUwhKktmB+UpEaiI+9 xSJRx4xtG7ZN5rxqek3FSacrEGkiXbMDxSpzVzjxN9KSh8uC2zaKtIrlksKOSg== 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 4Rmqxf5gq4z1Brf; Thu, 14 Sep 2023 21:21:10 +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 38ELLAX8023291; Thu, 14 Sep 2023 21:21:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38ELLAAT023288; Thu, 14 Sep 2023 21:21:10 GMT (envelope-from git) Date: Thu, 14 Sep 2023 21:21:10 GMT Message-Id: <202309142121.38ELLAAT023288@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: ee7077f24f5b - main - iwlwifi: fix a bug in iwl_ssid_exist() 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee7077f24f5b02bde8cf5c202848128f18733398 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=ee7077f24f5b02bde8cf5c202848128f18733398 commit ee7077f24f5b02bde8cf5c202848128f18733398 Author: Bjoern A. Zeeb AuthorDate: 2023-09-14 17:22:04 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-09-14 21:20:54 +0000 iwlwifi: fix a bug in iwl_ssid_exist() Rather than always comparing a given SSID to the first SSID of the IE list, compare it to the the iterator one. That way duplicates can be found. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/contrib/dev/iwlwifi/mvm/scan.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/contrib/dev/iwlwifi/mvm/scan.c b/sys/contrib/dev/iwlwifi/mvm/scan.c index a4077053e374..8c5d6860914b 100644 --- a/sys/contrib/dev/iwlwifi/mvm/scan.c +++ b/sys/contrib/dev/iwlwifi/mvm/scan.c @@ -447,7 +447,11 @@ static int iwl_ssid_exist(u8 *ssid, u8 ssid_len, struct iwl_ssid_ie *ssid_list) if (!ssid_list[i].len) break; if (ssid_list[i].len == ssid_len && +#if defined(__linux__) !memcmp(ssid_list->ssid, ssid, ssid_len)) +#elif defined(__FreeBSD__) + !memcmp(ssid_list[i].ssid, ssid, ssid_len)) +#endif return i; } return -1;