From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 88790C00454 for ; Wed, 11 Dec 2019 15:26:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5CDB322527 for ; Wed, 11 Dec 2019 15:26:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576078006; bh=R3PzLCaQxu/5uzwlhPBNV+2f/XzqMhM97bQjyE6C6FA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=qAcJvatp36azmpN0wrqOw4VtDT+UzXsaQZH8qX4CY4UdlPTtiY+TfdxO7/Q6DWJR4 YU3rCk/xND9BAK2/I4gxijUMJgyOa1iOJh5fvyvSMdJ94wbD+H7F+eSzxZw0dmrXZg na18Pa4zhtlcYuRMnfFxAQVemSG7ZBhSfP4lQ3uY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733016AbfLKP0i (ORCPT ); Wed, 11 Dec 2019 10:26:38 -0500 Received: from mail.kernel.org ([198.145.29.99]:59940 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732849AbfLKP0f (ORCPT ); Wed, 11 Dec 2019 10:26:35 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5715E2173E; Wed, 11 Dec 2019 15:26:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576077994; bh=R3PzLCaQxu/5uzwlhPBNV+2f/XzqMhM97bQjyE6C6FA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dU+l8kdY9wYOtZiQrzCrrlFHcm0p7nYAbFf/nNPHU0tzpoEZtkdOLVO5D/Z4+Va9V 2IEli08ZiDn29HdyxxIUj1pWneoU7fDaZKqhAWKZV+mhO0lYn1aWp6aXJR+d9Iaz8E vynPmb5REI503hn5xKMzMu3m4F7EfBKoHvpEDGA0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sharvari Harisangam , Ganapathi Bhat , Kalle Valo , Brian Norris Subject: [PATCH 4.19 236/243] mwifiex: update set_mac_address logic Date: Wed, 11 Dec 2019 16:06:38 +0100 Message-Id: <20191211150355.265549381@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191211150339.185439726@linuxfoundation.org> References: <20191211150339.185439726@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sharvari Harisangam commit 7afb94da3cd8a28ed7ae268143117bf1ac8a3371 upstream. In set_mac_address, driver check for interfaces with same bss_type For first STA entry, this would return 3 interfaces since all priv's have bss_type as 0 due to kzalloc. Thus mac address gets changed for STA unexpected. This patch adds check for first STA and avoids mac address change. This patch also adds mac_address change for p2p based on bss_num type. Signed-off-by: Sharvari Harisangam Signed-off-by: Ganapathi Bhat Signed-off-by: Kalle Valo Cc: Brian Norris Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/marvell/mwifiex/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/drivers/net/wireless/marvell/mwifiex/main.c +++ b/drivers/net/wireless/marvell/mwifiex/main.c @@ -960,10 +960,10 @@ int mwifiex_set_mac_address(struct mwifi mac_addr = old_mac_addr; - if (priv->bss_type == MWIFIEX_BSS_TYPE_P2P) + if (priv->bss_type == MWIFIEX_BSS_TYPE_P2P) { mac_addr |= BIT_ULL(MWIFIEX_MAC_LOCAL_ADMIN_BIT); - - if (mwifiex_get_intf_num(priv->adapter, priv->bss_type) > 1) { + mac_addr += priv->bss_num; + } else if (priv->adapter->priv[0] != priv) { /* Set mac address based on bss_type/bss_num */ mac_addr ^= BIT_ULL(priv->bss_type + 8); mac_addr += priv->bss_num;