From patchwork Tue Oct 3 19:33:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 148038 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2307156vqb; Tue, 3 Oct 2023 12:33:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHPrU5fy+9PZ+wL53rgpmF8xpIJcXfcVw4Jz6Q/uY5Yn4svx+LOGFM29ECMPCg/gJ0F/R07 X-Received: by 2002:a17:902:8b8c:b0:1c0:aca0:8c44 with SMTP id ay12-20020a1709028b8c00b001c0aca08c44mr564288plb.19.1696361623229; Tue, 03 Oct 2023 12:33:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696361623; cv=none; d=google.com; s=arc-20160816; b=rGMTaA40xNC2gp51H/CQ+E9S96rSUiwlBKpS9N9AbiesUughtGWZOkKz5TpraBAtwT 26S0whu4HAhjkyR5OjYCpzQYyASo0Hmq0k07roonsTnrrDYCBdx9t9DyCeRPg197Ld2L i9Fle4cvwZ56PDIKhmkOi+eyhWpKW6y/KlAhFRTkhuWLO0HRTmfjaliQ7Tswb/F1uQc5 7De9crkhBYtmjUPyOTKeaw/H96+jDTwbe2S9wS80DV2tGdvCpueEY3NeiypzCeAo3dbM XBNj2AiRrFlvy0W1Sd2fuSiD1+8Six/5WSKxqbQKXUDvnIaYfTHrPqR1H3gCUfkDxYHx 4YmQ== 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=0r3DREMiH6yQfDoDU6vaHZLHIyC1HQyFX1F4ZCsk8E0=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=fGM5SETts7pMyypD0qhs2Dj/7qQOoKcV50dut96j2gDnuI4cWrIVzVAhIxiiYQis38 H9Wf6OxRpRPmpYmCbrcnfczyV8lnqDrS5vGSUbHNKY1x4PfN2It0hYahNmAcgWwc0SvR VB7e/7891w/7ApaHXSLZbC9lLlI3Cqn7Yw0Ts04lUsPw9DaP2b6ci2jXZ3hkd6ERTSgo PdAkS7n9gRrueNCkQJm7xwY+GEoeF69GAbt8jlG4nC0vch450EGnk2OsS6kOBSbWjJwe Iy4ZYg0bWLq1+IwpPHJDTPn8CGWTU5XfjMObm/i/k8yYxUvtkbDCB+/ICmQU3gLK7GlA veNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Zn1GOAQ5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id q1-20020a170902f34100b001b8b4371af8si1849668ple.648.2023.10.03.12.33.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 12:33:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Zn1GOAQ5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 33A4A81A2076; Tue, 3 Oct 2023 12:33:41 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240925AbjJCTdN (ORCPT + 17 others); Tue, 3 Oct 2023 15:33:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240909AbjJCTdM (ORCPT ); Tue, 3 Oct 2023 15:33:12 -0400 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0AA13BD for ; Tue, 3 Oct 2023 12:33:09 -0700 (PDT) Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-9ae65c0e46fso53939466b.0 for ; Tue, 03 Oct 2023 12:33:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696361587; x=1696966387; darn=vger.kernel.org; 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=0r3DREMiH6yQfDoDU6vaHZLHIyC1HQyFX1F4ZCsk8E0=; b=Zn1GOAQ5szKDok5C87nu2G3rJKPVSylxIlZM73iF/Lq4dRY1syxPXD9KuG2Etef9IB l97rwm6hsIuUmaAS3UmyU5ifl2qnPgF4JGF2FpcegAWEyZnbW/05gGkxOCDrL4pj2vtG sCPt69NS2qK7vcEAckvIgw+5JzCdlhzQrpxBgW5FaplEtrZUxveTO0+S10evSnEEMUbI mRyDrBqSxFjqHw7h/2cUesZwprGa8ZKX1qYJqtkaIubwho7PW/N3SA8u0aBcmwR55x6l a41zNfXSThlPewQUMgDpu7EGHqGVe/8e4CROKpti+bh8sbpqyInFTaMdBhP7+GeEsBVn CwPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696361587; x=1696966387; 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=0r3DREMiH6yQfDoDU6vaHZLHIyC1HQyFX1F4ZCsk8E0=; b=CzGejyala7OkDJEnFQDwMPORs2ZqV8H2t3fqtYv8/vx6wZGIcOZLITfjisoLgb7ngb 9vQXAZv7Uz4KYItdmBQP/VW14Ob/J+i1ot4cdMZoMNyU622Br6Uhno6EoDo9g+YnVBDi sJBKWaoXNKJjkjJHTM2wa4lrHw/NjcWxRnslXElFP9ZvmtIeApavxGsE+aWk3UxvwL59 2HRGsz0hThllhxRWXalbsuiKZFzDk+QgP0wYjEwJmxXX1uTZjGRymg/tX4bVofluSYQj gs6u8hXlc+xV2tYsM5rO75h5bwWeqt4qRr3w1lCBd4b+YhIMIwDQMCvUiYWOIUvcbZ+q h++A== X-Gm-Message-State: AOJu0YzpSjwNKgdbWkaamUv6Vux120PiD30q5aDPK3o+3/Up7FmIF3Zl F7LwO4fuyFCOmhxlJfsooOo= X-Received: by 2002:a17:906:5194:b0:9a1:b4f9:b1db with SMTP id y20-20020a170906519400b009a1b4f9b1dbmr154888ejk.1.1696361587272; Tue, 03 Oct 2023 12:33:07 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id va17-20020a17090711d100b009aa292a2df2sm1512913ejb.217.2023.10.03.12.33.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 12:33:07 -0700 (PDT) Date: Tue, 3 Oct 2023 21:33:05 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 01/11] staging: rtl8192e: Remove function _rtl92e_wx_set_rawtx() Message-ID: <96196bf0f45934e8e49f1d185165e2a36f5bca7d.1696360403.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Tue, 03 Oct 2023 12:33:41 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778764085750018529 X-GMAIL-MSGID: 1778764085750018529 Remove function _rtl92e_wx_set_rawtx() as this functionality is not commonly used and the tool to access it is deprecated. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 24 +-------------- drivers/staging/rtl8192e/rtllib.h | 4 --- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 32 -------------------- 3 files changed, 1 insertion(+), 59 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c index e7be89833b59..f28e70a0da4f 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c @@ -122,25 +122,6 @@ static int _rtl92e_wx_get_power(struct net_device *dev, return rtllib_wx_get_power(priv->rtllib, info, wrqu, extra); } -static int _rtl92e_wx_set_rawtx(struct net_device *dev, - struct iw_request_info *info, - union iwreq_data *wrqu, char *extra) -{ - struct r8192_priv *priv = rtllib_priv(dev); - int ret; - - if (priv->hw_radio_off) - return 0; - - mutex_lock(&priv->wx_mutex); - - ret = rtllib_wx_set_rawtx(priv->rtllib, info, wrqu, extra); - - mutex_unlock(&priv->wx_mutex); - - return ret; -} - static int _rtl92e_wx_adapter_power_status(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) @@ -1044,9 +1025,6 @@ static const struct iw_priv_args r8192_private_args[] = { }, { SIOCIWFIRSTPRIV + 0x1, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "activescan" - }, { - SIOCIWFIRSTPRIV + 0x2, - IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "rawtx" }, { SIOCIWFIRSTPRIV + 0x6, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, IW_PRIV_TYPE_NONE, @@ -1072,7 +1050,7 @@ static const struct iw_priv_args r8192_private_args[] = { static iw_handler r8192_private_handler[] = { (iw_handler)_rtl92e_wx_set_debug, /*SIOCIWSECONDPRIV*/ (iw_handler)_rtl92e_wx_set_scan_type, - (iw_handler)_rtl92e_wx_set_rawtx, + (iw_handler)NULL, (iw_handler)NULL, (iw_handler)NULL, (iw_handler)NULL, diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index d3ac6ea71030..98b8b7db027e 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1755,10 +1755,6 @@ int rtllib_wx_get_freq(struct rtllib_device *ieee, struct iw_request_info *a, union iwreq_data *wrqu, char *b); void rtllib_wx_sync_scan_wq(void *data); -int rtllib_wx_set_rawtx(struct rtllib_device *ieee, - struct iw_request_info *info, - union iwreq_data *wrqu, char *extra); - int rtllib_wx_get_name(struct rtllib_device *ieee, struct iw_request_info *info, union iwreq_data *wrqu, char *extra); diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging/rtl8192e/rtllib_softmac_wx.c index bd2b8bba86eb..f32584291704 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c +++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c @@ -436,38 +436,6 @@ int rtllib_wx_get_mode(struct rtllib_device *ieee, struct iw_request_info *a, } EXPORT_SYMBOL(rtllib_wx_get_mode); -int rtllib_wx_set_rawtx(struct rtllib_device *ieee, - struct iw_request_info *info, - union iwreq_data *wrqu, char *extra) -{ - int *parms = (int *)extra; - int enable = (parms[0] > 0); - short prev = ieee->raw_tx; - - mutex_lock(&ieee->wx_mutex); - - if (enable) - ieee->raw_tx = 1; - else - ieee->raw_tx = 0; - - netdev_info(ieee->dev, "raw TX is %s\n", - ieee->raw_tx ? "enabled" : "disabled"); - - if (ieee->iw_mode == IW_MODE_MONITOR) { - if (prev == 0 && ieee->raw_tx) - netif_carrier_on(ieee->dev); - - if (prev && ieee->raw_tx == 1) - netif_carrier_off(ieee->dev); - } - - mutex_unlock(&ieee->wx_mutex); - - return 0; -} -EXPORT_SYMBOL(rtllib_wx_set_rawtx); - int rtllib_wx_get_name(struct rtllib_device *ieee, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) {