From patchwork Tue Sep 24 07:59:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1166435 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46cttv2S1Wz9sP3; Tue, 24 Sep 2019 18:01:43 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1iCflS-0008Sg-L5; Tue, 24 Sep 2019 08:01:38 +0000 Received: from mail-pf1-f196.google.com ([209.85.210.196]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iCfks-0007rS-Qn for kernel-team@lists.ubuntu.com; Tue, 24 Sep 2019 08:01:03 +0000 Received: by mail-pf1-f196.google.com with SMTP id h195so824619pfe.5 for ; Tue, 24 Sep 2019 01:01:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EKt8e1FgJ77+RvT2zfjk9wBltzC2CYOXQdjvr4MunUM=; b=CHrMshifyfEH1GeMvPNhS5J9HDFymBcImwdPhnRtVvGOSPnv6g+Die96ae0m8sU3h/ kQbZld8zFgAZrJhetAYUs/fjSwaOtPNzgBUW8knHaLLV2WDE6p1eUwKxjz1wnRGW0CGx qsj2VS6kc2r8WpywPjfQMuSequfdo+7w94jFPcaf2GtwbkojYn5ODJi4S7PqAvnD9+eq wmmQ1B9xIWc5UGU7ads9UsFGdQuO/08z85Hak8KsBrBI1L4ZSvBzqMV3wQ3RKjB0XyCe gLSlJ8RJHzsCR7DczjRNMkLsN4U1YITxK++MA92MPndP8g0q2ZT9vOIVwyUUOCb0Slsn AAoQ== X-Gm-Message-State: APjAAAWCFZOJDhtuQ2lwTDgOaJBm87zcjm0kCvlN8hUMiKoqh3SUMQuB u2bhXMQw6ehQrK2IZ2mS0TLJneUD X-Google-Smtp-Source: APXvYqzOct1w8dF+DIwiu6naXTlryLd2l4N6OhTbASQyb/Aa3NiZLjgOwyagkqaWUgSFN4Tirf5nMw== X-Received: by 2002:a62:5f83:: with SMTP id t125mr1936083pfb.125.1569312060327; Tue, 24 Sep 2019 01:01:00 -0700 (PDT) Received: from localhost.localdomain (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id g202sm1359780pfb.155.2019.09.24.01.00.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Sep 2019 01:00:59 -0700 (PDT) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 12/21][SRU][OEM-OSP1-B] cfg80211: make BSSID generation function inline Date: Tue, 24 Sep 2019 15:59:38 +0800 Message-Id: <20190924075947.33954-13-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190924075947.33954-1-vicamo.yang@canonical.com> References: <20190924075947.33954-1-vicamo.yang@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Sara Sharon BugLink: https://bugs.launchpad.net/bugs/1845138 This will enable reuse by mac80211. Signed-off-by: Sara Sharon Signed-off-by: Johannes Berg (cherry picked from commit 7ece9c372b21635120e7ab5ea3fc41ce9892ead8) Signed-off-by: You-Sheng Yang --- include/net/cfg80211.h | 23 +++++++++++++++++++++++ net/wireless/scan.c | 16 ---------------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 05ea88213e74a..360c7b6b19c4b 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -5413,6 +5413,29 @@ cfg80211_inform_bss_frame(struct wiphy *wiphy, return cfg80211_inform_bss_frame_data(wiphy, &data, mgmt, len, gfp); } +/** + * cfg80211_gen_new_bssid - generate a nontransmitted BSSID for multi-BSSID + * @bssid: transmitter BSSID + * @max_bssid: max BSSID indicator, taken from Multiple BSSID element + * @mbssid_index: BSSID index, taken from Multiple BSSID index element + * @new_bssid_addr: address of the resulting BSSID + */ +static inline void cfg80211_gen_new_bssid(const u8 *bssid, u8 max_bssid, + u8 mbssid_index, u8 *new_bssid_addr) +{ + u64 bssid_tmp, new_bssid; + u64 lsb_n; + + bssid_tmp = ether_addr_to_u64(bssid); + + lsb_n = bssid_tmp & ((1 << max_bssid) - 1); + new_bssid = bssid_tmp; + new_bssid &= ~((1 << max_bssid) - 1); + new_bssid |= (lsb_n + mbssid_index) % (1 << max_bssid); + + u64_to_ether_addr(new_bssid, new_bssid_addr); +} + /** * enum cfg80211_bss_frame_type - frame type that the BSS data came from * @CFG80211_BSS_FTYPE_UNKNOWN: driver doesn't know whether the data is diff --git a/net/wireless/scan.c b/net/wireless/scan.c index ab0f0178ee0eb..f1b06e9c1038a 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -179,22 +179,6 @@ static bool __cfg80211_unlink_bss(struct cfg80211_registered_device *rdev, return true; } -static void cfg80211_gen_new_bssid(const u8 *bssid, u8 max_bssid, - u8 mbssid_index, u8 *new_bssid_addr) -{ - u64 bssid_tmp, new_bssid = 0; - u64 lsb_n; - - bssid_tmp = ether_addr_to_u64(bssid); - - lsb_n = bssid_tmp & ((1 << max_bssid) - 1); - new_bssid = bssid_tmp; - new_bssid &= ~((1 << max_bssid) - 1); - new_bssid |= (lsb_n + mbssid_index) % (1 << max_bssid); - - u64_to_ether_addr(new_bssid, new_bssid_addr); -} - static size_t cfg80211_gen_new_ie(const u8 *ie, size_t ielen, const u8 *subelement, size_t subie_len, u8 *new_ie, gfp_t gfp)