Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp2894687pxu; Mon, 7 Dec 2020 20:13:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJyFWjp4oRxr9iEa3P0+gDPXppYKkQwf/J/rgspaAcu4CnQ63O9lyW2YEjvGe1ci5yoBi2Ow X-Received: by 2002:a17:906:e212:: with SMTP id gf18mr21984914ejb.551.1607400827326; Mon, 07 Dec 2020 20:13:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607400827; cv=none; d=google.com; s=arc-20160816; b=w+k2uHG5ipq32krHLG5K9IfM5dc8vmjQEYQmwScSIfhyZ+i2iYjsqFDGX79zsDnASk TXTFq+267yEW1S9X1LDbudXBjV7rUXQWJYjcR5yx4TVUcZpTbO9uNEo5M5uQnQ5UoBv9 OeKzv5+TYT/dW6vD2lIWVggWkZ6C5oT0sWtl1wXV3w2P0Zy1famX0kDD730QC0smQ7WW ptZ7ZGR1Bw68GvAN5amtH8qVstS3bYxCEI5icNPAxfW51e3gOEdmzswYgrmh5xpvZecE UBiH6XGCUO9ZsKdL++H61xJmXEimPczGerzW1MaJtwnmddDG2C/fiSF7IPH140BQHtAe ArJw== 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=6KIyuVe6VyFOKOY1iJM9w6ygBrAwLaf1UtxyGLFKOTM=; b=apMTYbwAyOOC1ozBEk9gXvuuKzJFwQNu6QIRE56x2lrvY2B5qFTyFbsEJv4Ex7MQBF 4OoqjgTNY968UXcifrolvmhVpwxZtkSdj9w1Ide3uw/xz6QZrI4yfhfaBvrIn3PMSXpf UwoZuWSlFlgzk2gQ8/NF88QHKeJzsd2if7q+aTr8ReLsPjfdwCBCCYs2uc2wCAnV6CQB D/3icP/Y+bkq/+tBm4wHtM6c+GfwOEmvvgembkmNStfbfXM1nKAz87fK7CTmc/ioaiYZ 38PU3s+tZPOTgwdR1k0kG+uAUQq40uW9rJB+uv8PeRmRkH36gvb9sET5NtZKd0eerrIn Mb8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=p6cf+WlM; 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 h26si7206796ejc.253.2020.12.07.20.13.23; Mon, 07 Dec 2020 20:13:47 -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=p6cf+WlM; 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 S1727885AbgLHEJP (ORCPT + 99 others); Mon, 7 Dec 2020 23:09:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54750 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727559AbgLHEJO (ORCPT ); Mon, 7 Dec 2020 23:09:14 -0500 Received: from mail-il1-x142.google.com (mail-il1-x142.google.com [IPv6:2607:f8b0:4864:20::142]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 59ACEC0611CD for ; Mon, 7 Dec 2020 20:07:55 -0800 (PST) Received: by mail-il1-x142.google.com with SMTP id 2so11245646ilg.9 for ; Mon, 07 Dec 2020 20:07:55 -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=6KIyuVe6VyFOKOY1iJM9w6ygBrAwLaf1UtxyGLFKOTM=; b=p6cf+WlMC6WHpNSzEgHaKr2ztTGDZfHrofUktx43No4G0+K/bCKboxplQN5W4kIVfS 6NhoH/bWfEJoCC4EnIS4OtKwr+tbHxfuXZq357iyj+g0yDzpL5QVJVHGu3+z7CyiBV+S ToB5OnRCtWvBVWoW1nCtMohmJPymz3Ro6b9fUIgC1ya2fiRDvd9V2iO89mFwdZIRak0y H6VhJKj3SQu/RI5Ctyz6nMldzbpWD/OW5R7u4OraTSCHF0bCTx98RExiNUCg97IDA7I9 xUCGQB5m2uLv9E5l2l+ln+Rx+hw5OemBSgw9Ho8VZPPTyi50qCE/DNrcweLpOg0XKwQe SkyQ== 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=6KIyuVe6VyFOKOY1iJM9w6ygBrAwLaf1UtxyGLFKOTM=; b=rXYZ7MJxi545PVvAJdwfW4pAYTtm6HlhFimnxWSHi4fjgfYkBTAVlYzzywHouGHb4a BgZheLGqKjMho27BQ7ETsXShlN9GC1ddduUftxiISR6G3qKck+xKqhiUG/Z0wi3nfgCL sO+m5SidqF+ZFUW++Lqs0eh0v/eq+ChiyEgsFhXcJeuTrBJUw4+79jbc0N4cRTjetJy7 5ziT15UI2F1n0Fu0eZ9hNFcd07+95YNyTncpowHnIvqWUkkdfMN71gOa/wOZD1ij9G1p OA8tQzJx261Pq5I+XVVwHDFiaoCgVgfd+y5OgBKKiIj1LzBV1lRlUG4umyUG/tkLnDSw 6VXw== X-Gm-Message-State: AOAM530DfaNUsxw0jIV8Kts0w1YFll7362XdecV9a6oPwRmoZkgLQOzI UgkammQUIADqY/YYPjApbVXXLhdMSqo= X-Received: by 2002:a05:6e02:19cd:: with SMTP id r13mr10385284ill.199.1607400474872; Mon, 07 Dec 2020 20:07:54 -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.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Dec 2020 20:07:54 -0800 (PST) From: Ross Schmidt To: gregkh@linuxfoundation.org Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Ross Schmidt Subject: [PATCH v2 15/21] staging: rtl8723bs: replace _WAPI_IE_ Date: Mon, 7 Dec 2020 22:07:27 -0600 Message-Id: <20201208040733.379197-16-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 _WAPI_IE_ macro with kernel provided WLAN_EID_BSS_AC_ACCESS_DELAY from linux/ieee80211.h. Signed-off-by: Ross Schmidt --- drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 4 ++-- drivers/staging/rtl8723bs/include/wifi.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c index 28d5892d8bda..be4cffce4f5d 100644 --- a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c +++ b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c @@ -623,8 +623,8 @@ int rtw_get_wapi_ie(u8 *in_ie, uint in_len, u8 *wapi_ie, u16 *wapi_len) while (cnt < in_len) { authmode = in_ie[cnt]; - /* if (authmode == _WAPI_IE_) */ - if (authmode == _WAPI_IE_ && (!memcmp(&in_ie[cnt+6], wapi_oui1, 4) || + /* if (authmode == WLAN_EID_BSS_AC_ACCESS_DELAY) */ + if (authmode == WLAN_EID_BSS_AC_ACCESS_DELAY && (!memcmp(&in_ie[cnt+6], wapi_oui1, 4) || !memcmp(&in_ie[cnt+6], wapi_oui2, 4))) { if (wapi_ie) { memcpy(wapi_ie, &in_ie[cnt], in_ie[cnt+1]+2); diff --git a/drivers/staging/rtl8723bs/include/wifi.h b/drivers/staging/rtl8723bs/include/wifi.h index e221d4574f32..29621fce6a83 100644 --- a/drivers/staging/rtl8723bs/include/wifi.h +++ b/drivers/staging/rtl8723bs/include/wifi.h @@ -393,7 +393,6 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe) #define _FTIE_ 55 #define _TIMEOUT_ITVL_IE_ 56 #define _SRC_IE_ 59 -#define _WAPI_IE_ 68 #define _RIC_Descriptor_IE_ 75 #define _MME_IE_ 76 /* 802.11w Management MIC element */ -- 2.25.1