From patchwork Sat Jun 17 13:56:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 109499 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1998288vqr; Sat, 17 Jun 2023 07:10:18 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5wyIFyF71f/PjDZ9xEfWq3EEdicBLdveuL8vLpuZYOJhB6uEwmXWI9a2QeEafXIYR5f5vt X-Received: by 2002:a05:6a20:9385:b0:11f:92d2:1442 with SMTP id x5-20020a056a20938500b0011f92d21442mr2583836pzh.29.1687011017774; Sat, 17 Jun 2023 07:10:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687011017; cv=none; d=google.com; s=arc-20160816; b=fljdjqp2CdEX6TcF+w5olXJsSzqgUm74ljdLuIOZ379btXd+PMBRuIZh2g26Vb4P79 RMq4vvNJ0o2ND6QidBJfbo8KtKLg54kd7EEgzxTHhvMLSYFnCypQmVsL7rOr0KlFtwov HjrOgn3WwRUzRI+krFua6jLCqb4PGHakseaLjIdgReKdtyV3x6N74oI/2X0Rd8cP1zjx 40FEae/n2NO0ufFGfjdS/ux1S6yVBoHONjNBO3IJ05kKakNdGhgNnqmnNE4WOMjpSMpM 9sBGuXZxkNiCqm6Bn5hMy2jyg4X0zRNS5EoVadk5xQX7qE6aVtYEl93w045b7R18wp8R GDgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=MyvbzIni4wgZcmkEUFqYkqtBiqFXP5/UM0SCkXhdxz4=; b=wlYxYsNv6qj37mAqMvafYGp98GdjJ1R36xMYMIpFCBmJtCrfuQo47hf/YZBiHaaES0 qfz5zmNrZeg1YZlOL1bbsll0b02q5w6KYXyNWOv/z7bepThNx167uCvxE2O3xN4A90zQ byUbUBW49tRUss+OHSQYvt8Soie5r6vGi4LWuVlos2yaUpOcGbBhucEgTvk0zlV76ge3 xgRR15SPDijtqwzscR0c4q2RaJ3hGvt5RgV6kZ1nGrcDNFRd6zbxgd4oT9lniKbEwvKI yI/0URKYrZHLKwfjs0NAx8dx62cJd4HIPdta96K2Ey5OGwb12Dy/VDrRjW9dDeZ9P2i3 RpCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=S4ZD5v1s; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j10-20020a63b60a000000b00543eef37092si16478053pgf.442.2023.06.17.07.09.59; Sat, 17 Jun 2023 07:10:17 -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; dkim=pass header.i=@gmail.com header.s=20221208 header.b=S4ZD5v1s; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235911AbjFQN5D (ORCPT + 99 others); Sat, 17 Jun 2023 09:57:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46434 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235347AbjFQN46 (ORCPT ); Sat, 17 Jun 2023 09:56:58 -0400 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A7977212C for ; Sat, 17 Jun 2023 06:56:53 -0700 (PDT) Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-98502b12fd4so46544166b.1 for ; Sat, 17 Jun 2023 06:56:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687010212; x=1689602212; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=MyvbzIni4wgZcmkEUFqYkqtBiqFXP5/UM0SCkXhdxz4=; b=S4ZD5v1sudtTnq74OafYco/0ZajVLhBI0w7gMovgBWVI8v67SC+HvybiUrx9Rlpofk Oa3aVFdFlI0MurUEp2+gw0NgVJASVn4qu57mrdsWOfxTHs64Zx14UVzXcESRG3Cwt1xj YELJXg6cM+ChmvlYehcJqBe2F4bV5JeDZMYJ6YKlzoqmFwRA4i1oNQB6fjj5rZocPfl/ O3c3679Hc1f6oSvpJnOD6PGgq0w3Y2s2YO7v3myIUjC7Bq7ScnRvCi4CrHIPFgm0rcgV vtWiBtkbduqW3lMdshDrn/ww8A/YK8U/i3/z7X1V1jsLa1hoCsI0v5FUNs5UmS4Bwim3 QtvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687010212; x=1689602212; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=MyvbzIni4wgZcmkEUFqYkqtBiqFXP5/UM0SCkXhdxz4=; b=dQyDq1NUWYHyrykA2oNRShn6SSkciOPATUX4Z2RYhqKd1iZ5mhqXVswCFZzjReHNUc wnfAX8FK51sNN8oCimDk/ADr5ratBXKr0pIU+fLTyIYi++xtGAjTtrx9Gkd19zpOnpYB pQH9YHcChLcoBnHLcOrNGpN76CzxwkduCsk29IgwsyUT3CiRTNhHDIQd68PmZrxlsTuh gmlsRxIxHFcAysfQzXQW02aeDbMMFo3+pF+YzDEcB4/h+X1k3VDNcAMRN7B5mC4BbhNv dHSWB9t6qPdAT8mYytLiFZEhGmY3NcstDlWnd9a4JhaBaDr2ISN1soP1Q80UWF6Oopn6 kV/Q== X-Gm-Message-State: AC+VfDx3w7GhAlBGLue3uO3HDKCxodxhHITdLoPw9j9R5rTm4lFq2Dvy 93IaNiyr+CMsHeOrQ2h9CLzbFnci2p8= X-Received: by 2002:a17:906:7293:b0:975:c046:dd34 with SMTP id b19-20020a170906729300b00975c046dd34mr4017909ejl.1.1687010211924; Sat, 17 Jun 2023 06:56:51 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2e0b.dip0.t-ipconnect.de. [87.186.46.11]) by smtp.gmail.com with ESMTPSA id m8-20020a17090607c800b00982bb85e8e4sm3147197ejc.18.2023.06.17.06.56.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Jun 2023 06:56:51 -0700 (PDT) Date: Sat, 17 Jun 2023 15:56:49 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 2/9] staging: rtl8192e: Remove unsupported modes IEEE_N_5G and IEEE_A Message-ID: <40c5b21654376348144280dbe45203140c6e6807.1687007788.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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?1768959265333544828?= X-GMAIL-MSGID: =?utf-8?q?1768959265333544828?= Remove unsupported modes IEEE_N_5G and IEEE_A as those are not supported by hardware and are not offered by user software. Remove resulting dead code and unused defines. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 4 ---- drivers/staging/rtl8192e/rtl819x_HTProc.c | 2 -- drivers/staging/rtl8192e/rtllib.h | 8 ++------ drivers/staging/rtl8192e/rtllib_rx.c | 4 +--- drivers/staging/rtl8192e/rtllib_softmac.c | 6 ++---- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 2 +- 6 files changed, 6 insertions(+), 20 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index f030e06f16f6..10dc1c4e9913 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -1816,9 +1816,6 @@ void rtl92e_update_ratr_table(struct net_device *dev) rtl92e_config_rate(dev, &rate_config); ratr_value = rate_config | *pMcsRate << 12; switch (ieee->mode) { - case IEEE_A: - ratr_value &= 0x00000FF0; - break; case IEEE_B: ratr_value &= 0x0000000F; break; @@ -1827,7 +1824,6 @@ void rtl92e_update_ratr_table(struct net_device *dev) ratr_value &= 0x00000FF7; break; case IEEE_N_24G: - case IEEE_N_5G: if (ieee->ht_info->peer_mimo_ps == 0) ratr_value &= 0x0007F007; else diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c index fe30a291e64c..9cbe229a601f 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -424,14 +424,12 @@ static u8 HT_PickMCSRate(struct rtllib_device *ieee, u8 *pOperateMCS) } switch (ieee->mode) { - case IEEE_A: case IEEE_B: case IEEE_G: for (i = 0; i <= 15; i++) pOperateMCS[i] = 0; break; case IEEE_N_24G: - case IEEE_N_5G: pOperateMCS[0] &= RATE_ADPT_1SS_MASK; pOperateMCS[1] &= RATE_ADPT_2SS_MASK; pOperateMCS[3] &= RATE_ADPT_MCS32_MASK; diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index b4fad9bf0f03..c789f7a9d3c6 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -309,9 +309,7 @@ enum rt_op_mode { }; #define aSifsTime \ - (((priv->rtllib->current_network.mode == IEEE_A) \ - || (priv->rtllib->current_network.mode == IEEE_N_24G) \ - || (priv->rtllib->current_network.mode == IEEE_N_5G)) ? 16 : 10) + ((priv->rtllib->current_network.mode == IEEE_N_24G) ? 16 : 10) #define MGMT_QUEUE_NUM 5 @@ -1724,12 +1722,10 @@ struct rtllib_device { u8 priv[]; }; -#define IEEE_A (1<<0) #define IEEE_B (1<<1) #define IEEE_G (1<<2) #define IEEE_N_24G (1<<4) -#define IEEE_N_5G (1<<5) -#define IEEE_MODE_MASK (IEEE_A|IEEE_B|IEEE_G) +#define IEEE_MODE_MASK (IEEE_B | IEEE_G) /* Generate a 802.11 header */ diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c index 36dace010203..cb13964b5181 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -2329,9 +2329,7 @@ static inline int rtllib_network_init( } if (network->bssht.bd_support_ht) { - if (network->mode == IEEE_A) - network->mode = IEEE_N_5G; - else if (network->mode & (IEEE_G | IEEE_B)) + if (network->mode & (IEEE_G | IEEE_B)) network->mode = IEEE_N_24G; } if (rtllib_is_empty_essid(network->ssid, network->ssid_len)) diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c index 821ca86b8bcd..438bf0d48b75 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -181,9 +181,7 @@ static u8 MgntQuery_MgntFrameTxRate(struct rtllib_device *ieee) rate = ieee->basic_rate & 0x7f; if (rate == 0) { - if (ieee->mode == IEEE_A || - ieee->mode == IEEE_N_5G || - (ieee->mode == IEEE_N_24G && !ht_info->bCurSuppCCK)) + if (ieee->mode == IEEE_N_24G && !ht_info->bCurSuppCCK) rate = 0x0c; else rate = 0x02; @@ -2577,7 +2575,7 @@ static void rtllib_start_ibss_wq(void *data) } netdev_info(ieee->dev, "%s(): ieee->mode = %d\n", __func__, ieee->mode); - if ((ieee->mode == IEEE_N_24G) || (ieee->mode == IEEE_N_5G)) + if (ieee->mode == IEEE_N_24G) HTUseDefaultSetting(ieee); else ieee->ht_info->bCurrentHTSupport = false; diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging/rtl8192e/rtllib_softmac_wx.c index d6d90e6ba2d3..6013ae7c6abf 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c +++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c @@ -489,7 +489,7 @@ int rtllib_wx_get_name(struct rtllib_device *ieee, struct iw_request_info *info, { const char *b = ieee->modulation & RTLLIB_CCK_MODULATION ? "b" : ""; const char *g = ieee->modulation & RTLLIB_OFDM_MODULATION ? "g" : ""; - const char *n = ieee->mode & (IEEE_N_24G | IEEE_N_5G) ? "n" : ""; + const char *n = ieee->mode & (IEEE_N_24G) ? "n" : ""; scnprintf(wrqu->name, sizeof(wrqu->name), "802.11%s%s%s", b, g, n); return 0;