Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4172189pxj; Tue, 8 Jun 2021 08:06:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzeys2UQhj0CeLMcRLJookJ5qy4N9hf/vsfdAthgQBXJ2XpvcAfSTf57r94dS4r07ijbRLG X-Received: by 2002:a05:6402:344:: with SMTP id r4mr25569869edw.226.1623164786222; Tue, 08 Jun 2021 08:06:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623164786; cv=none; d=google.com; s=arc-20160816; b=TUFmWs5o3FGwAUgKtKauO0WXzEhUGPitn1MfvSR+zsOsE+ameA3bd0aHfbOdr/C9Ow 4p9mZMvxPljou+7EzrZyz/SzyG77i+3CDVo8imNZO0zU8Vz9J/q35KuYFVLORm9ZLeGP zMAJuDcn2dx/N7wzR6NC9Q9EJvJ8yJ3e1oX61/cT7HwBqEbjweSxuE2xFID9cwPeqrz5 acTYcYLZq4JTFod7rFh6Qvj9TyXzkdzhicb3SckXDyDx5f56kIjm8XqDugPDZ7QEhnOt g4Ca0mOLWUzdDrOV5nhjRi3qjRyy76fUVVikLb2nSjlu0mjnPATd277VFh8o1pRV8vgg ZSfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dmarc-filter:sender:dkim-signature; bh=t5CHvQYjEMkHJFa488MQBARpVpjFpm0SGQTgSs3E0ik=; b=J+XRrDPDgkqoGaD2f9orp6S0T2hkTzhmU+6vMrHJklfVORI8yisFNETGPAFPA5kh9u /u4lLWuvn9BPapCH2y+YK3OivrJiS++hVj/vyJd1d5Z6TiickyWoDeTB1AjITK9bBrcN jkM9VJUlGme/RV9/0KCCk8JgHISbmdQXLBlzPQzo3E1nM7aP/oPqMaSq0BS/TVXTTDfd H0axZygyBPmAwho1ja8uzOy4bZv4Igbluv6ucn/Vg27GKCp1cqQy4kkJHH6fatVaefQH VkGXnMZEIIalqpwRU3Zm3FvFUGj+41mtladNpm083xthCQBgFlUlx3UtjU3gKnuVyQ4I hGhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mg.codeaurora.org header.s=smtp header.b="Q2/D55vz"; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id k13si15105377ejb.687.2021.06.08.08.06.01; Tue, 08 Jun 2021 08:06:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@mg.codeaurora.org header.s=smtp header.b="Q2/D55vz"; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233705AbhFHPGo (ORCPT + 99 others); Tue, 8 Jun 2021 11:06:44 -0400 Received: from m43-7.mailgun.net ([69.72.43.7]:27741 "EHLO m43-7.mailgun.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233354AbhFHPGo (ORCPT ); Tue, 8 Jun 2021 11:06:44 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1623164691; h=References: In-Reply-To: Message-Id: Date: Subject: Cc: To: From: Sender; bh=t5CHvQYjEMkHJFa488MQBARpVpjFpm0SGQTgSs3E0ik=; b=Q2/D55vzDulx6lExL/ACo0+zzlamZegUcS0aQKGSJMjIfqgPxSCXHs4JqFXSNhLb2UwHt0RD 3W3wsjX66wYebd1v2xuhXoyJJLaOOccyKGIBSR7me7GA7KVbg0GHQfUflEk51jkSX2T+iLkG twrlAmUFGIrdCwwCMPfTffRWlv8= X-Mailgun-Sending-Ip: 69.72.43.7 X-Mailgun-Sid: WyI3YTAwOSIsICJsaW51eC13aXJlbGVzc0B2Z2VyLmtlcm5lbC5vcmciLCAiYmU5ZTRhIl0= Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n01.prod.us-west-2.postgun.com with SMTP id 60bf86f98491191eb3ed3eca (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Tue, 08 Jun 2021 15:04:25 GMT Sender: mkenna=codeaurora.org@mg.codeaurora.org Received: by smtp.codeaurora.org (Postfix, from userid 1001) id E72DCC4338A; Tue, 8 Jun 2021 15:04:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-caf-mail-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=ALL_TRUSTED,BAYES_00,SPF_FAIL, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from ppranees-linux.qualcomm.com (blr-c-bdr-fw-01_GlobalNAT_AllZones-Outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: mkenna) by smtp.codeaurora.org (Postfix) with ESMTPSA id 2C6EDC433F1; Tue, 8 Jun 2021 15:04:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 2C6EDC433F1 Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=fail smtp.mailfrom=mkenna@codeaurora.org From: Maharaja Kennadyrajan To: 000ath11k@lists.infradead.org, linux-wireless@vger.kernel.org Cc: Maharaja Kennadyrajan Subject: [PATCH v3 1/3] nl80211: Add support for beacon tx mode Date: Tue, 8 Jun 2021 20:34:01 +0530 Message-Id: <1623164643-7803-2-git-send-email-mkenna@codeaurora.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1623164643-7803-1-git-send-email-mkenna@codeaurora.org> References: <1623164643-7803-1-git-send-email-mkenna@codeaurora.org> Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org User can configure the below beacon tx mode 1. Staggered mode and 2. Burst mode while bring-up the AP or MESH. Beacons can be sent out in burst(continuously in a single shot one after another) or staggered (equally spread out over beacon interval) mode. Set the beacon_tx_mode as 1 for Staggered mode and 2 for burst mode. Hence, added the support in the nl80211/cfg80211 layer to honour the beacon tx mode configuration and pass this value to the driver. Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.5.0.1-00630-QCAHKSWPL_SILICONZ-2 Signed-off-by: Maharaja Kennadyrajan --- V3: Addressed Johnson's comment on v2 patch. V2: Addressed Johannes's comment on v1 patch. include/net/cfg80211.h | 4 ++++ include/uapi/linux/nl80211.h | 16 ++++++++++++++++ net/wireless/nl80211.c | 9 +++++++++ 3 files changed, 29 insertions(+) diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 58c2cd4..65161fd 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -1182,6 +1182,7 @@ enum cfg80211_ap_settings_flags { * @he_oper: HE operation IE (or %NULL if HE isn't enabled) * @fils_discovery: FILS discovery transmission parameters * @unsol_bcast_probe_resp: Unsolicited broadcast probe response parameters + * @beacon_tx_mode: Beacon Tx Mode setting */ struct cfg80211_ap_settings { struct cfg80211_chan_def chandef; @@ -1214,6 +1215,7 @@ struct cfg80211_ap_settings { struct cfg80211_he_bss_color he_bss_color; struct cfg80211_fils_discovery fils_discovery; struct cfg80211_unsol_bcast_probe_resp unsol_bcast_probe_resp; + enum nl80211_beacon_tx_mode beacon_tx_mode; }; /** @@ -2061,6 +2063,7 @@ struct mesh_config { * to operate on DFS channels. * @control_port_over_nl80211: TRUE if userspace expects to exchange control * port frames over NL80211 instead of the network interface. + * @beacon_tx_mode: Beacon Tx Mode setting. * * These parameters are fixed when the mesh is created. */ @@ -2084,6 +2087,7 @@ struct mesh_setup { struct cfg80211_bitrate_mask beacon_rate; bool userspace_handles_dfs; bool control_port_over_nl80211; + enum nl80211_beacon_tx_mode beacon_tx_mode; }; /** diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h index f962c06..a86b32e 100644 --- a/include/uapi/linux/nl80211.h +++ b/include/uapi/linux/nl80211.h @@ -2560,6 +2560,10 @@ enum nl80211_commands { * disassoc events to indicate that an immediate reconnect to the AP * is desired. * + * @NL80211_ATTR_BEACON_TX_MODE: used to configure the beacon tx mode as + * staggered mode = 1 or burst mode = 2 in %NL80211_CMD_START_AP or + * %NL80211_CMD_JOIN_MESH from user-space. + * * @NUM_NL80211_ATTR: total number of nl80211_attrs available * @NL80211_ATTR_MAX: highest attribute number currently defined * @__NL80211_ATTR_AFTER_LAST: internal use @@ -3057,6 +3061,8 @@ enum nl80211_attrs { NL80211_ATTR_DISABLE_HE, + NL80211_ATTR_BEACON_TX_MODE, + /* add attributes here, update the policy in nl80211.c */ __NL80211_ATTR_AFTER_LAST, @@ -7299,4 +7305,14 @@ enum nl80211_sar_specs_attrs { NL80211_SAR_ATTR_SPECS_MAX = __NL80211_SAR_ATTR_SPECS_LAST - 1, }; +/** + * enum nl80211_beacon_tx_mode - Beacon Tx Mode enum. + * Used to configure beacon staggered mode or beacon burst mode. + */ +enum nl80211_beacon_tx_mode { + NL80211_BEACON_DEFAULT_MODE = 0, + NL80211_BEACON_STAGGERED_MODE = 1, + NL80211_BEACON_BURST_MODE = 2, +}; + #endif /* __LINUX_NL80211_H */ diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index fc9286a..6076d00 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -759,6 +759,7 @@ static const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = { [NL80211_ATTR_RECONNECT_REQUESTED] = { .type = NLA_REJECT }, [NL80211_ATTR_SAR_SPEC] = NLA_POLICY_NESTED(sar_policy), [NL80211_ATTR_DISABLE_HE] = { .type = NLA_FLAG }, + [NL80211_ATTR_BEACON_TX_MODE] = NLA_POLICY_RANGE(NLA_U32, 1, 2), }; /* policy for the key attributes */ @@ -5342,6 +5343,10 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info) params.dtim_period = nla_get_u32(info->attrs[NL80211_ATTR_DTIM_PERIOD]); + if (info->attrs[NL80211_ATTR_BEACON_TX_MODE]) + params.beacon_tx_mode = + nla_get_u32(info->attrs[NL80211_ATTR_BEACON_TX_MODE]); + err = cfg80211_validate_beacon_int(rdev, dev->ieee80211_ptr->iftype, params.beacon_interval); if (err) @@ -11896,6 +11901,10 @@ static int nl80211_join_mesh(struct sk_buff *skb, struct genl_info *info) return -EINVAL; } + if (info->attrs[NL80211_ATTR_BEACON_TX_MODE]) + setup.beacon_tx_mode = + nla_get_u32(info->attrs[NL80211_ATTR_BEACON_TX_MODE]); + if (info->attrs[NL80211_ATTR_MESH_SETUP]) { /* parse additional setup parameters if given */ err = nl80211_parse_mesh_setup(info, &setup); -- 2.7.4