Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp2895400pxu; Mon, 7 Dec 2020 20:15:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJzSCTWP5/2XNTppj/BTc1JDnTx8pGNQ4xZ0+8qz+WFlemOGCJ0C30NyXOv63vqaBwYnV43L X-Received: by 2002:a05:6402:a53:: with SMTP id bt19mr23429678edb.104.1607400935664; Mon, 07 Dec 2020 20:15:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607400935; cv=none; d=google.com; s=arc-20160816; b=h0WGs6FD+zdKEX/GoYtR7u0GkDD03zyRUgWH6PpXHioaMvuT09ivZfCxZo/mUPPgko iUreJkEQbD4PMrkDqnIVXY4GDhJWiu6UAGekD8MHvTJRgo2TxWoQn5Z4D/SlKoN7RanW oL4XVgNEfw0nKVDffSoNonNGQpXyaynLm1WJy0WYw2FK+tZMnbUfidGbnxZOCeAgOTOe A0cj3EuyhgCvl3DoW2kv6WpnfaGHwy6bQKAs3I2GeSTMk1ppxbDhvb3U4rz7k+jU57iN xryxZU0aCpg5fBdqeK8lcpmxlW3XParRLkyvhFg3vF0UQM/jdT1muRbz/cI/3Cr722OB XtMQ== 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 :dkim-signature; bh=oLlSjiOdVZpwvu7OfmvcVt/9RsPam8KuE+uFIZj6dmE=; b=ahlH9z7WPYKwobcxyogvr6kYEt69evwyM+rKv+vy6azRLBQfVAKAw5BDKDtyv+zEQ/ HiNYS3zepz+6aGP8GakLTSsDQf/5ZMAz+rqPMkUeH+Pqwdoh8rAdYxtIh+EB3u2k1No+ S7WuYk7WMqxkQX3/LlWQ3gIJW3oq6pd0cmN8rCp4vq2tVPKgvlhr6Fnq/AQy+wQCSv3x OiuZnozfza6HM7N/Kjm+xRqKUprRJ41iic5tUVSeBv1G8Yj5C7ETnegTXacblErUqhYB /Bo+L22sccXpXNw1FIMKQk4cxlllOYPuWpnpSjDMbsUQbiPQMlVM3Xu3mK42yCUE8BXZ rAxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=BES1jrsJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j16si12255505edj.439.2020.12.07.20.15.13; Mon, 07 Dec 2020 20:15:35 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-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=@gmail.com header.s=20161025 header.b=BES1jrsJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727721AbgLHEJG (ORCPT + 99 others); Mon, 7 Dec 2020 23:09:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54786 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726961AbgLHEJG (ORCPT ); Mon, 7 Dec 2020 23:09:06 -0500 Received: from mail-io1-xd41.google.com (mail-io1-xd41.google.com [IPv6:2607:f8b0:4864:20::d41]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2E8E8C0611CB for ; Mon, 7 Dec 2020 20:07:53 -0800 (PST) Received: by mail-io1-xd41.google.com with SMTP id o8so15673512ioh.0 for ; Mon, 07 Dec 2020 20:07:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oLlSjiOdVZpwvu7OfmvcVt/9RsPam8KuE+uFIZj6dmE=; b=BES1jrsJgvnKN0K9QiAKkK+AbTXvbYhLlS1aWjS2QhvMpTAvwaQPOf6PtokTBWr6ub 9nZWGz/jGvr4B+o7dsmlR3E5vSXkkgKkxcYTR+kK9JzCqj92YgquUbvugqdgvd1EAfNh FS+tDscpiHlHxGmjZU2eYA53AhT2+aMp25N8moNfN8yO2Zj3ve+Cyvfyv8/BxijZkT6w pzVSEnN2MypPJVlEmLGrctUdqFZr+Yuc2KkZQAIECAX/ntxb88T9uQ+D+HCbiFAzk/iN P8yOz1bqW/NuQNoD1tIdYJOXKd40imFYvPdB2v+bWwkwecGhBLLIw7vEDgVH9TGAzxDb FmkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oLlSjiOdVZpwvu7OfmvcVt/9RsPam8KuE+uFIZj6dmE=; b=QlnEIcFFx/TWrWSM1CNUF5l3rtM19Oh97TY47ZxnRnQdfI9mKbFiFkvpxIROTwO+IV h5zUScs5md9sUfSd3apbyx5l3uLHtyXwjmVENe5VIMMHhJAMTFQNrX0wkJLrztUk/gSr YjBqFi9ojJx1xxGo9LvnbwLwr2xaxuqkmOehVN0dVQmvZRhe6VXRk0lZ0Nd9cAtxbT3J rxeXlzQrZ9ciTKWOaXPDsXhaJM22K4L9Wbb7n6TPk3sESA7Ed5N8shhwkDtFPau8sBUP UpbXtHPE9322XvwYeV8DFwBEo1ZSmGAC24aADhGUsw4xWX3pX19hUIZN3HrsTvA8Q/tH kkxw== X-Gm-Message-State: AOAM530IQe7BtoQjqAfGuiV/NSlAFow4airzfOYsjaaGE5xGR34zuPiG JGn6VypP91qOvxqpWxRg0AZwScu1F0c= X-Received: by 2002:a02:ca54:: with SMTP id i20mr19914578jal.111.1607400472589; Mon, 07 Dec 2020 20:07:52 -0800 (PST) Received: from localhost.localdomain (c-73-242-81-227.hsd1.mn.comcast.net. [73.242.81.227]) by smtp.gmail.com with ESMTPSA id g2sm8630390ilh.41.2020.12.07.20.07.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Dec 2020 20:07:52 -0800 (PST) From: Ross Schmidt To: gregkh@linuxfoundation.org Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Ross Schmidt Subject: [PATCH v2 13/21] staging: rtl8723bs: replace _ERPINFO_IE_ Date: Mon, 7 Dec 2020 22:07:25 -0600 Message-Id: <20201208040733.379197-14-ross.schm.dev@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201208040733.379197-1-ross.schm.dev@gmail.com> References: <20201208040733.379197-1-ross.schm.dev@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Replace unique _ERPINFO_IE_ macro with kernel provided WLAN_EID_ERP_INFO from linux/ieee80211.h. Signed-off-by: Ross Schmidt --- drivers/staging/rtl8723bs/core/rtw_ap.c | 12 ++++++------ drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 6 +++--- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 2 +- drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 +- drivers/staging/rtl8723bs/include/wifi.h | 1 - 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8723bs/core/rtw_ap.c index 139350288d1b..5e93a85cb6ce 100644 --- a/drivers/staging/rtl8723bs/core/rtw_ap.c +++ b/drivers/staging/rtl8723bs/core/rtw_ap.c @@ -1059,7 +1059,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) /* parsing ERP_IE */ p = rtw_get_ie( ie + _BEACON_IE_OFFSET_, - _ERPINFO_IE_, + WLAN_EID_ERP_INFO, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_) ); @@ -1585,7 +1585,7 @@ static void update_bcn_erpinfo_ie(struct adapter *padapter) /* parsing ERP_IE */ p = rtw_get_ie( ie + _BEACON_IE_OFFSET_, - _ERPINFO_IE_, + WLAN_EID_ERP_INFO, &len, (pnetwork->IELength - _BEACON_IE_OFFSET_) ); @@ -1768,7 +1768,7 @@ void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx) break; - case _ERPINFO_IE_: + case WLAN_EID_ERP_INFO: update_bcn_erpinfo_ie(padapter); @@ -1964,7 +1964,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) if (pmlmepriv->num_sta_non_erp == 1) { beacon_updated = true; - update_beacon(padapter, _ERPINFO_IE_, NULL, true); + update_beacon(padapter, WLAN_EID_ERP_INFO, NULL, true); } } } else { @@ -1975,7 +1975,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) if (pmlmepriv->num_sta_non_erp == 0) { beacon_updated = true; - update_beacon(padapter, _ERPINFO_IE_, NULL, true); + update_beacon(padapter, WLAN_EID_ERP_INFO, NULL, true); } } } @@ -2086,7 +2086,7 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta) pmlmepriv->num_sta_non_erp--; if (pmlmepriv->num_sta_non_erp == 0) { beacon_updated = true; - update_beacon(padapter, _ERPINFO_IE_, NULL, true); + update_beacon(padapter, WLAN_EID_ERP_INFO, NULL, true); } } diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c index 93380493e8dc..5d56fbf0c1fe 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -1705,7 +1705,7 @@ unsigned int OnAssocRsp(struct adapter *padapter, union recv_frame *precv_frame) HT_info_handler(padapter, pIE); break; - case _ERPINFO_IE_: + case WLAN_EID_ERP_INFO: ERP_IE_handler(padapter, pIE); break; @@ -2555,7 +2555,7 @@ void issue_beacon(struct adapter *padapter, int timeout_ms) pframe = rtw_set_ie(pframe, WLAN_EID_IBSS_PARAMS, 2, (unsigned char *)(&ATIMWindow), &pattrib->pktlen); /* ERP IE */ - pframe = rtw_set_ie(pframe, _ERPINFO_IE_, 1, &erpinfo, &pattrib->pktlen); + pframe = rtw_set_ie(pframe, WLAN_EID_ERP_INFO, 1, &erpinfo, &pattrib->pktlen); } @@ -2758,7 +2758,7 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p pframe = rtw_set_ie(pframe, WLAN_EID_IBSS_PARAMS, 2, (unsigned char *)(&ATIMWindow), &pattrib->pktlen); /* ERP IE */ - pframe = rtw_set_ie(pframe, _ERPINFO_IE_, 1, &erpinfo, &pattrib->pktlen); + pframe = rtw_set_ie(pframe, WLAN_EID_ERP_INFO, 1, &erpinfo, &pattrib->pktlen); } diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c index ff5125b33749..e8e91e24c04d 100644 --- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c +++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c @@ -1479,7 +1479,7 @@ void update_beacon_info(struct adapter *padapter, u8 *pframe, uint pkt_len, stru bwmode_update_check(padapter, pIE); break; - case _ERPINFO_IE_: + case WLAN_EID_ERP_INFO: ERP_IE_handler(padapter, pIE); VCS_update(padapter, psta); break; diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rtl8723bs/core/rtw_xmit.c index 1d62ce501e80..187a2aa77a55 100644 --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c @@ -1447,7 +1447,7 @@ void rtw_update_protection(struct adapter *padapter, u8 *ie, uint ie_len) case AUTO_VCS: default: - perp = rtw_get_ie(ie, _ERPINFO_IE_, &erp_len, ie_len); + perp = rtw_get_ie(ie, WLAN_EID_ERP_INFO, &erp_len, ie_len); if (!perp) { pxmitpriv->vcs = NONE_VCS; } else { diff --git a/drivers/staging/rtl8723bs/include/wifi.h b/drivers/staging/rtl8723bs/include/wifi.h index 2f13bbe38f74..ff8865d1d846 100644 --- a/drivers/staging/rtl8723bs/include/wifi.h +++ b/drivers/staging/rtl8723bs/include/wifi.h @@ -389,7 +389,6 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe) #define _SUPPORTED_CH_IE_ 36 #define _CH_SWTICH_ANNOUNCE_ 37 /* Secondary Channel Offset */ -#define _ERPINFO_IE_ 42 #define _EXT_SUPPORTEDRATES_IE_ 50 #define _FTIE_ 55 -- 2.25.1