From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.9 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5AB38C4338F for ; Mon, 23 Aug 2021 19:31:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 40C2061040 for ; Mon, 23 Aug 2021 19:31:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232166AbhHWTcb (ORCPT ); Mon, 23 Aug 2021 15:32:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230377AbhHWTc3 (ORCPT ); Mon, 23 Aug 2021 15:32:29 -0400 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA216C061575 for ; Mon, 23 Aug 2021 12:31:46 -0700 (PDT) Received: by mail-wr1-x436.google.com with SMTP id q11so822337wrr.9 for ; Mon, 23 Aug 2021 12:31:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dbeFXa1zC8iknta7RykccKAQcTiUi7bLBPrj54xI+js=; b=RLd6nUQsicylMhgvgT7JCI9mK9Zrc9q/UFb4/HX2orYHbUWcCZts86CiwLQRSBLSyc 6cGfIC9nDpNoAxHZaSW0FguylXyXvCeTWsGYlonmABuHMkGns8rwx7eebrOM9E4If+96 18znWkgFUNB2+zjZm6rva0vIc6N8daU/F3BTVPjfNktEp6NPfno186zjsn1Au5bc0bNR Vqeu5r1i1axRZh2L+X9+M8xAJAirCZh4ModIiuaMs+l7ew576fraUy5uWYYf11KF3F78 ZZDPm1PWofKsA7Vg1FUcDx9Z5WbgsmR3qdQFk7KurhdSl3eSbpAHH+SP7tAQuRTgtMvJ DLFQ== 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:mime-version :content-transfer-encoding; bh=dbeFXa1zC8iknta7RykccKAQcTiUi7bLBPrj54xI+js=; b=Op6Qh6aaHVMNmATZrMQXdHV5rwyMaLjMX6kbvG54rRwVOSTd+PfaTmk7EQfCgikb97 ApJP2uk49LZ3Xc2X5LEv/725UllBIgaE697VtpLJEtFPJNdTzH6LjhoZV0XDT3IAQ9pV p5UZwS9MjIFg9MwddWMLNCQHdUhROM5C0OHfLtoJARDyvCYhXANu0/FYEKDXN+fHiDsN dYWRdKp/Y5Ug3uZ/t++1i493+9TRlQeBn4NCSBMcJkn8Jd4J7COyTKqftVHcNuxoffWC ZXNb+ifbuqCJoY40cWG5XaA3huFIfch6F+S+EKuCuKULb1MuFtpaWtgAqwlbx7LdgG8e hY7A== X-Gm-Message-State: AOAM530l0ap755PNyamdIeZiHw+dQVBW3SStSsnddfxxtbgL+6LoiQxl L5CPWy7DPp/nACSBKp3wC1E= X-Google-Smtp-Source: ABdhPJwL0UD+0oB61nmDyueLQeXiC0eF7ptd3XKBnIlHEqFZkOTQEX3xQ1S3e/6RoTs1HLSapJImvw== X-Received: by 2002:adf:ef05:: with SMTP id e5mr15395215wro.237.1629747105328; Mon, 23 Aug 2021 12:31:45 -0700 (PDT) Received: from localhost.localdomain ([2a02:8108:96c0:3b88::3c39]) by smtp.gmail.com with ESMTPSA id q3sm80398wmf.37.2021.08.23.12.31.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Aug 2021 12:31:44 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, martin@kaiser.cx, fmdefrancesco@gmail.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH] staging: r8188eu: remove 5 GHz code Date: Mon, 23 Aug 2021 21:30:28 +0200 Message-Id: <20210823193028.12391-1-straube.linux@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The driver is for chips that do not operate in the 5 GHz band. Remove some 5 GHz related code. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/os_dep/ioctl_linux.c | 30 ++++++-------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/drivers/staging/r8188eu/os_dep/ioctl_linux.c b/drivers/staging/r8188eu/os_dep/ioctl_linux.c index ab4a9200f079..81d4255d1785 100644 --- a/drivers/staging/r8188eu/os_dep/ioctl_linux.c +++ b/drivers/staging/r8188eu/os_dep/ioctl_linux.c @@ -208,17 +208,10 @@ static char *translate_scan(struct adapter *padapter, else snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bg"); } else { - if (pnetwork->network.Configuration.DSConfig > 14) { - if (ht_cap) - snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11an"); - else - snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11a"); - } else { - if (ht_cap) - snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11gn"); - else - snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11g"); - } + if (ht_cap) + snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11gn"); + else + snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11g"); } start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_CHAR_LEN); @@ -737,17 +730,10 @@ static int rtw_wx_get_name(struct net_device *dev, else snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11bg"); } else { - if (pcur_bss->Configuration.DSConfig > 14) { - if (ht_cap) - snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11an"); - else - snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11a"); - } else { - if (ht_cap) - snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11gn"); - else - snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11g"); - } + if (ht_cap) + snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11gn"); + else + snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11g"); } } else { snprintf(wrqu->name, IFNAMSIZ, "unassociated"); -- 2.32.0