From patchwork Sun Oct 23 17:08:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 8068 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp71760wru; Sun, 23 Oct 2022 10:14:11 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5WuY8skpEyoo3BzP9ex0jugAZXealipK4E2hDcbI9Ljx1v/2u0Y1zgf4z104Pce3Cc6u7G X-Received: by 2002:a50:baec:0:b0:461:4c59:12bf with SMTP id x99-20020a50baec000000b004614c5912bfmr12615388ede.54.1666545251559; Sun, 23 Oct 2022 10:14:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666545251; cv=none; d=google.com; s=arc-20160816; b=AzWcx0gyUrsdcXCUV7xt5YI6JJVtVeQ+Oop1qLv3q0vkr6yUhSc+aB1htFvPJkhJV4 12pz2G7YF19hYZIuCIkvf20yIVpGLpXdWPFERGu1dAH4Pxu3KGrOu8JqVGKypGfiCXSQ sgggFhDPGrO77BU1qqMPLGwxupGgvUJFviYrHZZGMMtbQiqAjoWuY+BH0NWWZXALebEL d/xqy9XBZwf557zXd+zmL/AlUPzD2s7mIDn9s8PwcoTcgx+Q3CIzb/KOVIgXSrgw44mG mQe/gErNx3JGuK+ledtbndjG90GASPIWLD3ufoUHZSpNjUmVY60SH31d7T74x6qv34iL ob5g== 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; bh=sHpE/8A/VffTPJ05Tpc6yFSpZMU3ibyHoMr4iZIEbTk=; b=t2bxOOvyXFtdRkWQ4R7RKP1JF41HL1sT1rulN2npUJGZqoEg2VbusS1lDw4o9mHr2X XZNrnAF//1s1S8x+pEJok42NVkWSM0xU8ntg2/vZ3u11+dgK4lE8CDcjrz5CnGoc89sB Y5Swt6qNJOSxGLvI9ObI46peFuzYOyv9NjNZeLITtFq7mKBrT04U7O8M/51lfkCbm/db pTUzN9FEIrnZjzw7iwnQCQjS+5g+W1bPLWabgv1iyuk0cSO+iWYASRu8ZF9GR976iHg9 WJGxX1W4KuIkyE2nvGHzxATEWM5ohqtijFR5z/6H3lBz343mk00GglZXUXDWR+aE9OKK hvFw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nc23-20020a1709071c1700b00779f8e7ec5bsi26602055ejc.42.2022.10.23.10.13.47; Sun, 23 Oct 2022 10:14:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230510AbiJWRId (ORCPT + 99 others); Sun, 23 Oct 2022 13:08:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48242 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230370AbiJWRI0 (ORCPT ); Sun, 23 Oct 2022 13:08:26 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E477973305 for ; Sun, 23 Oct 2022 10:08:24 -0700 (PDT) Received: from ipservice-092-217-070-181.092.217.pools.vodafone-ip.de ([92.217.70.181] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1omeSQ-0000Rj-G1; Sun, 23 Oct 2022 19:08:18 +0200 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 3/5] staging: r8188eu: NetworkTypeInUse is not in use Date: Sun, 23 Oct 2022 19:08:06 +0200 Message-Id: <20221023170808.46233-4-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221023170808.46233-1-martin@kaiser.cx> References: <20221023170808.46233-1-martin@kaiser.cx> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747499353853121220?= X-GMAIL-MSGID: =?utf-8?q?1747499353853121220?= NetworkTypeInUse from struct wlan_bssid_ex is not used. Remove NetworkTypeInUse itself, the code to set it and the enum for its possible values. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_mlme.c | 16 ---------------- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 3 --- drivers/staging/r8188eu/include/wlan_bssdef.h | 9 --------- 3 files changed, 28 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c index 1f69e5c57d5d..a47ae33454b3 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme.c +++ b/drivers/staging/r8188eu/core/rtw_mlme.c @@ -1819,22 +1819,6 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter) pdev_network->Rssi = 0; - switch (pregistrypriv->wireless_mode) { - case WIRELESS_11B: - pdev_network->NetworkTypeInUse = (Ndis802_11DS); - break; - case WIRELESS_11G: - case WIRELESS_11BG: - case WIRELESS_11_24N: - case WIRELESS_11G_24N: - case WIRELESS_11BG_24N: - pdev_network->NetworkTypeInUse = (Ndis802_11OFDM24); - break; - default: - /* TODO */ - break; - } - pdev_network->Configuration.DSConfig = (pregistrypriv->channel); if (cur_network->network.InfrastructureMode == Ndis802_11IBSS) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c index 8050f682c997..61d2680cbafc 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -6188,9 +6188,6 @@ u8 collect_bss_info(struct adapter *padapter, struct recv_frame *precv_frame, st memcpy(bssid->SupportedRates + i, (p + 2), len); } - /* todo: */ - bssid->NetworkTypeInUse = Ndis802_11OFDM24; - if (bssid->IELength < 12) return _FAIL; diff --git a/drivers/staging/r8188eu/include/wlan_bssdef.h b/drivers/staging/r8188eu/include/wlan_bssdef.h index 81bda91a4136..831c465df500 100644 --- a/drivers/staging/r8188eu/include/wlan_bssdef.h +++ b/drivers/staging/r8188eu/include/wlan_bssdef.h @@ -17,14 +17,6 @@ struct ndis_802_11_ssid { u8 Ssid[32]; }; -enum NDIS_802_11_NETWORK_TYPE { - Ndis802_11FH, - Ndis802_11DS, - Ndis802_11OFDM5, - Ndis802_11OFDM24, - Ndis802_11NetworkTypeMax /* dummy upper bound */ -}; - struct ndis_802_11_config_fh { u32 Length; /* Length of structure */ u32 HopPattern; /* As defined by 802.11, MSB set */ @@ -233,7 +225,6 @@ struct wlan_bssid_ex { struct ndis_802_11_ssid Ssid; u32 Privacy; NDIS_802_11_RSSI Rssi;/* in dBM,raw data ,get from PHY) */ - enum NDIS_802_11_NETWORK_TYPE NetworkTypeInUse; struct ndis_802_11_config Configuration; enum ndis_802_11_network_infra InfrastructureMode; unsigned char SupportedRates[NDIS_802_11_LENGTH_RATES_EX];