Received: by 2002:a05:7412:6592:b0:d7:7d3a:4fe2 with SMTP id m18csp2542833rdg; Mon, 14 Aug 2023 06:05:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE7mKCSOrjZp9BkX8KfgT3QhOhBpMWkpYolGVTkQmhP5wISgIUdaKMbPNFhnmToHhIeh5Ua X-Received: by 2002:a05:6402:1807:b0:523:100b:70da with SMTP id g7-20020a056402180700b00523100b70damr11046104edy.4.1692018347138; Mon, 14 Aug 2023 06:05:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692018347; cv=none; d=google.com; s=arc-20160816; b=yURWEKqXuNUrUqHM6oR5aVRDbFeMB5q3Q3GyHO4uDhGu7iHxgeqJYkPzvgecplXpu5 u9qydp6cR6VY3Onj/y/feywy4iFD35SCj4/GtYY4qzXJhz5NmCsgWN+v9q1N6jKbMDxw Scvr7WwjAgJbzJTg8kkCaDzVEQaKdfY+BDVHzpGCMPUB8boKGEkki4ZG3A5r6GKhQ1vQ 9prsqEVSn/GFeFNtUX+AVBH1FDoAg2++pxFOcF2kpefpQfXiCT5TemPzse4KjXzYR88P w58lx2L4lvZ/YgVUeZLq78HNLigSreVQ4BDwwWg4ff3cmecXU6pKyXgHJGa5SthBTfRx z6NA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=AeJbhGCqBD66kTgX3w6Kx+aeR2DHYiVzFB8/9Uhsxas=; fh=pRqsT4w4uCsG/bWnINfvZVMyX9wExXd09y0QAs4hb3Y=; b=y5GPv9jMilX7TmJ2tBHJQjdULV3ZhAaZOpDrvB8m6A8C3OJCAUnt4huTGjEZ6iCCxf 0YIuTwLcPGcZF7Kywqbnk1fuCortuTYdsxxgHNrZmcaDTTFnZNFEuaLGodn7xpCl07fl ahhwVzbUqP0dMeER9NY4DeTm//3DhpaFxDZr0szon9T6x4l54sPJmNTRbY9VIRA4gw5G aejgD9v72xK8LC1GXNoFvucSqLTK9jtxVa+4NL3Bah7lIrLg0JB2WhLj1BcmDRUiPK9d qndtmmY0VrzkU9FMK4ePl8ktj4U+Kz+TrAQSNKrw5DXD0YnR+pxkrQs+f01jctTfde/o DhQw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e22-20020a056402089600b0052567e6585dsi1355919edy.72.2023.08.14.06.05.32; Mon, 14 Aug 2023 06:05:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230089AbjHNMnd (ORCPT + 54 others); Mon, 14 Aug 2023 08:43:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230161AbjHNMn1 (ORCPT ); Mon, 14 Aug 2023 08:43:27 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D4D46E4A for ; Mon, 14 Aug 2023 05:43:26 -0700 (PDT) Received: from kwepemi500008.china.huawei.com (unknown [172.30.72.57]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4RPYs91HfPz2BdQV; Mon, 14 Aug 2023 20:40:29 +0800 (CST) Received: from huawei.com (10.90.53.73) by kwepemi500008.china.huawei.com (7.221.188.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Mon, 14 Aug 2023 20:43:24 +0800 From: Ruan Jinjie To: , , , , , , , , , CC: Subject: [PATCH net-next 2/2] wifi: mwifiex: Use helpers to check multicast addresses Date: Mon, 14 Aug 2023 20:42:12 +0800 Message-ID: <20230814124212.302738-3-ruanjinjie@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230814124212.302738-1-ruanjinjie@huawei.com> References: <20230814124212.302738-1-ruanjinjie@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.90.53.73] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemi500008.china.huawei.com (7.221.188.139) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Use is_multicast_ether_addr() and is_unicast_ether_addr() to check the addresses. Signed-off-by: Ruan Jinjie --- drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2 +- drivers/net/wireless/marvell/mwifiex/wmm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c index ba4e29713a8c..d8c0f90a86fc 100644 --- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c +++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c @@ -3356,7 +3356,7 @@ static int mwifiex_set_wowlan_mef_entry(struct mwifiex_private *priv, } if (!wowlan->patterns[i].pkt_offset) { - if (!(byte_seq[0] & 0x01) && + if (is_unicast_ether_addr(byte_seq) && (byte_seq[MWIFIEX_MEF_MAX_BYTESEQ] == 1)) { mef_cfg->criteria |= MWIFIEX_CRITERIA_UNICAST; continue; diff --git a/drivers/net/wireless/marvell/mwifiex/wmm.c b/drivers/net/wireless/marvell/mwifiex/wmm.c index 00a5679b5c51..8558995e8fc7 100644 --- a/drivers/net/wireless/marvell/mwifiex/wmm.c +++ b/drivers/net/wireless/marvell/mwifiex/wmm.c @@ -871,7 +871,7 @@ mwifiex_wmm_add_buf_txqueue(struct mwifiex_private *priv, } } else { memcpy(ra, skb->data, ETH_ALEN); - if (ra[0] & 0x01 || mwifiex_is_skb_mgmt_frame(skb)) + if (is_multicast_ether_addr(ra) || mwifiex_is_skb_mgmt_frame(skb)) eth_broadcast_addr(ra); ra_list = mwifiex_wmm_get_queue_raptr(priv, tid_down, ra); } -- 2.34.1