From patchwork Tue Sep 12 19:28: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: 138422 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp663664vqx; Tue, 12 Sep 2023 13:31:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEVJVYnzgcQs1a5DmT9rM28eipcgMsWnlEQNO3dYbcnEVKZIEtI7ig4BKa2Uefi9uFGy6Hg X-Received: by 2002:a17:90a:8c4:b0:263:ebab:a152 with SMTP id 4-20020a17090a08c400b00263ebaba152mr381420pjn.19.1694550694548; Tue, 12 Sep 2023 13:31:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694550694; cv=none; d=google.com; s=arc-20160816; b=aEO0qvHXwzjVaVJyMXrEaLaMf/PX1cryfECYdJ86cNy02CsuYfy9ECZ2UWyADzlaKt NfePV3OtJcrHY2pnsoQNhti/LNAScZdIQFJ4CdhH92d5EM86hIVcw/gGE1RJlm4Ip4b2 uRaM0XRFMtY5Gq0Hl7bwjEBJDUeaKT9NO8ugSEBGOXDTggwnk9lDdqMxrhZElCzkj0Ni Ynm1se7JHIyMMl7flBNQEQd6tS4h2kUFLX04wm4HncBqmVfP3t+waHTa8KcZamq3vmlk /uhMZPGGtCgBATKJW80BOd62PKy49oPIHCvqWG5UCN1sT9xF/UhRa3tUoUI58607c7Ee Gv6g== 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=hAqNl41hKkSBMm9EVB1yezgOtRcp8ANCKow1rmKoN+M=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=kW25PuEhAMnnPbC0SxzUPiwOTWSbx08C18HXXeLYTk+WPoO90AT/Utt1M5w6poB+Pf 5DomT+hspPe/0hsbsFCO6I4D+me9m2oHHoEYWDdve4+ZLNuhF00+FnO8HQcIgEeqMkYF Nzw4pNu26z7LE2Lm0dYYY0pUSdxxBqWWf+eSXbgbU/NPEo6xxcl4db6PSF8f0PuZgcBN 8LlMUvWPIF2jgNaX+qQo1j2fxzO6QrdWCU8qLMkJNaQdxVa4ggtm937TbNjB4QelI5uo zkXeGdVK2uJBOMKvNXEgmywoWBZACSixyGfpTNwLxnwN51CUp0Wo1mrTayWgg9AoXFCR jlCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=K1qKbX3w; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id nh18-20020a17090b365200b0027400759b2fsi36145pjb.31.2023.09.12.13.31.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 13:31:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=K1qKbX3w; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (Postfix) with ESMTP id 1C5618051ABC; Tue, 12 Sep 2023 12:28:24 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235056AbjILT2O (ORCPT + 36 others); Tue, 12 Sep 2023 15:28:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233722AbjILT2N (ORCPT ); Tue, 12 Sep 2023 15:28:13 -0400 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 82C8BE4B for ; Tue, 12 Sep 2023 12:28:09 -0700 (PDT) Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-31c49de7a41so898051f8f.1 for ; Tue, 12 Sep 2023 12:28:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694546888; x=1695151688; 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=hAqNl41hKkSBMm9EVB1yezgOtRcp8ANCKow1rmKoN+M=; b=K1qKbX3whTuI+m2Ch4HVSfWwzCZCbx50QsxocsLC+wbmxLPUSepEQNIsYQgC0Rwmjc u8kM3zDfv30XZTq9OdXCEaD6ZZaOrO5LzeC47qaLHIV5GUtvdFdKjZocGiRZiBVx/mlI bFRlr20m2+7n/thJROjZKluaOXoalREQTgcDFNG520PANzDkkOqNyY1ANFVDlyneQewE zNoYPVwd0cq/bCZAUw4uy6vVJpzD8yQ5kjNRsKLdEHBGaAqxK+uU4IODCrth5P74I9AV vNUI8Eu/mbuW8VYki5sLszB7X11WJD+iFB32/+TbWy5AgypSVeL+MMJ49nK5mrUXQh4s 5Y4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694546888; x=1695151688; 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=hAqNl41hKkSBMm9EVB1yezgOtRcp8ANCKow1rmKoN+M=; b=usdfiIc/be6Mq9nawFG8qZh9CUKd8xtkWgM3Frt8KR0SvScap+Bnjl0TWqdWslP9C5 xDzLdOjaIFXVhUVjNQZ1BNFX8VKcpNcz2XR8egk6Cb3cZf3zYxCrU3yQm8Ke3iq6UJzH 8MASd7g6FYuXhHxaef3YIyEuEHqebWwTKtGgFIQ9zpcUKBzUQ65LRdJiq43gyeWk626Q Xz7VaCz0fN+VibFHDf3l24ObdQWhsyL4hfQuYaMesXrdbUSn9cSjdNtb1fiyMkcAJIU7 XzjWWYvBsLKEXVJDUYA+LFaCdkjrc9QWqKhtRom8P2j2cDWdmTXMcf3RtB5ENwpuMqww 1tqg== X-Gm-Message-State: AOJu0YwIZO1ZBCqhpDOFwkJEHUxnoRxd6ElW2C5YYHfvWlB8+RX4WMxk A+SEBZK+PkfVL+JuQgiSo+/foVSl8W/RCw== X-Received: by 2002:a5d:4001:0:b0:31a:e772:ddf9 with SMTP id n1-20020a5d4001000000b0031ae772ddf9mr301620wrp.4.1694546887726; Tue, 12 Sep 2023 12:28:07 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id o14-20020adfeace000000b003197869bcd7sm13517861wrn.13.2023.09.12.12.28.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 12:28:07 -0700 (PDT) Date: Tue, 12 Sep 2023 21:28:05 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/8] staging: rtl8192e: Remove useless equation in debug output Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: 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 (groat.vger.email [0.0.0.0]); Tue, 12 Sep 2023 12:28:24 -0700 (PDT) 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 groat.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776865189119266070 X-GMAIL-MSGID: 1776865189119266070 When "switch (WLAN_FC_GET_STYPE(le16_to_cpu(header->frame_ctl)))" results in "case RTLLIB_STYPE_BEACON:" there is no need to calculate this again inside "case" and when a frame is a beacon there is no need to print the frame identifier again as it is explicit. Same for PROBE RESPONSE and PROBE REQUEST. Remove dead code. Signed-off-by: Philipp Hortmann --- v1->v2: Unchanged --- drivers/staging/rtl8192e/rtllib_rx.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c index 0e695b144b36..9f944eefa41e 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -2652,8 +2652,7 @@ static void rtllib_rx_mgt(struct rtllib_device *ieee, switch (WLAN_FC_GET_STYPE(le16_to_cpu(header->frame_ctl))) { case RTLLIB_STYPE_BEACON: - netdev_dbg(ieee->dev, "received BEACON (%d)\n", - WLAN_FC_GET_STYPE(le16_to_cpu(header->frame_ctl))); + netdev_dbg(ieee->dev, "received BEACON\n"); rtllib_process_probe_response( ieee, (struct rtllib_probe_response *)header, stats); @@ -2666,14 +2665,12 @@ static void rtllib_rx_mgt(struct rtllib_device *ieee, break; case RTLLIB_STYPE_PROBE_RESP: - netdev_dbg(ieee->dev, "received PROBE RESPONSE (%d)\n", - WLAN_FC_GET_STYPE(le16_to_cpu(header->frame_ctl))); + netdev_dbg(ieee->dev, "received PROBE RESPONSE\n"); rtllib_process_probe_response(ieee, (struct rtllib_probe_response *)header, stats); break; case RTLLIB_STYPE_PROBE_REQ: - netdev_dbg(ieee->dev, "received PROBE REQUEST (%d)\n", - WLAN_FC_GET_STYPE(le16_to_cpu(header->frame_ctl))); + netdev_dbg(ieee->dev, "received PROBE REQUEST\n"); if ((ieee->softmac_features & IEEE_SOFTMAC_PROBERS) && (ieee->iw_mode == IW_MODE_ADHOC && ieee->link_state == MAC80211_LINKED)) From patchwork Tue Sep 12 19:28:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 138665 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp886746vqx; Tue, 12 Sep 2023 23:27:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH+WMkmYyntmuOTtvANNLEABW+diIyQ9F4FwMhiTy2N1u0xzTlPFnma7hjbFYWy8L3m/EF6 X-Received: by 2002:a17:902:8693:b0:1b5:561a:5ca9 with SMTP id g19-20020a170902869300b001b5561a5ca9mr1606182plo.50.1694586431730; Tue, 12 Sep 2023 23:27:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694586431; cv=none; d=google.com; s=arc-20160816; b=slFCSweCQ0pCAu90knK3p5TuYajEMQrY1xhSbF/bex1xx25p0WZxPWSbfD3pRXkCq6 E04XDf3MyM9zBdMLnSHsXHYB8QT2CdOy3RqtdXuP/xd0ifIsFFuEGIAw2dRLYfm0J59T Fec1EWjFj942HqgXx9y8kIEIyPArnLXV9Tl9Wmp2jUj2WRYVKl+Q8ni5AX6c+eCceaRA yTEUYHAZ63CF4zZe5Ce9n7oiVqaaK2vFOP/VVh2WRBSTBkEpm6TfSBlYAjd7WObSY36p 2JJLnpmavlKuWaV9k4QKdYlRYsWXzhsZTR1vpbBZc+/w9kJSbDBvOQMgvCj2QLwziMck xtTw== 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=QexNkjG2mXAQpwTtJAKwU4X2ozG1nmIWtcTUMqxmunQ=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=MAOPFy2eZp/XUVd8z8MDjVB1dZ5ljGXCoQnp67BE2h2iVYPQiRSAfmEJTsv+bR/jzG b3/ShO8GBSGPLMpM7ar8av+Z5p+SMPkZvLJ8JLA+NyRyoqVKCpEo91xvzhnfNTSgZ60/ eqHz5siekzrp8c8FNdnHV5D5yjiKMZoNZi/kEzFt0QIJdJ0EyOLg4U3RS9rCmd7K49Cu nPbOFo3molVHZ8etRdd7bjplUJzcjv+hPlNVs38+lczs6+3Uu31QSUcMr8CoRyAvBAVp 0dxBl+RKHvl/qAE2x3sZs0L7C/CsJfGK4syGEHHEvy1zqZZxL+0O+CPwbRKUyQQoScsQ s0Sw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b="bql/TAt9"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id n8-20020a170902d2c800b001bc996e40cdsi10074694plc.511.2023.09.12.23.27.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 23:27:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b="bql/TAt9"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (Postfix) with ESMTP id B7F4D8025DDB; Tue, 12 Sep 2023 12:28:50 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233053AbjILT2W (ORCPT + 36 others); Tue, 12 Sep 2023 15:28:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47272 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236751AbjILT2U (ORCPT ); Tue, 12 Sep 2023 15:28:20 -0400 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE42810D0 for ; Tue, 12 Sep 2023 12:28:14 -0700 (PDT) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-402ba03c754so17013495e9.0 for ; Tue, 12 Sep 2023 12:28:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694546893; x=1695151693; 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=QexNkjG2mXAQpwTtJAKwU4X2ozG1nmIWtcTUMqxmunQ=; b=bql/TAt9pS+hQvTz9NMbz8jFK4Syr4n0GBcSMGxrn5R3ba/SIhpklS3snCpyaTggn2 jp1erRtGEtVkh7rmKA4lGG1Fh7J5Un46rCU9pygcXRyZBAQlLdlr763gv9J0JkKMcrbh +g7bta1yzB/NohT4H+fCYV4orbuWBOrO49/W0jLlhQbIfDI7rTU2hcYhbdiLsJAg565Q Dt40+PqpR8a0NXWrnqY0O19U6gV/0aqg+87ofxnkm2Nu3Fzpm1+lubWd52DZvrERUVQQ TBSRFEu2qHnMzvWtmUCw3HpLGMusgGeJnyYFM8TN/FtQIqPjI91LuVm5QamDiXR3tFvE 5OOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694546893; x=1695151693; 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=QexNkjG2mXAQpwTtJAKwU4X2ozG1nmIWtcTUMqxmunQ=; b=IUL/sBFfk0m5q5xVh6zundVA1V/p1gfFpk/y5MIsnjp7P69Y1f12sQEiTcnTRx0BL6 FKBQ8mjUqVZqk/Ma9b3Pgr7pQOM5uKubqBoWKH2N9AeKfz6gqtLOy6fiHl0rbhTYIkBP KHEE4r6+abLW8Y7uuEVu0WV+L8Sam7gWJ34I+mEZ7L/OY0vplfjjbKuy07DBk5OuWpAc 3KAlu3cpV3hyFb5noNJKojqNXYa65igShVpg77wylV2VQ5JOD8wiXSrJLg3/FiS9u2ZO 115K5GZH6GtAe0NSl0Y/aP/XL7upXlq2VJn50XtYn/sxs9GomiaAnQ380B+PuRBjr7zz zf2g== X-Gm-Message-State: AOJu0YwpWtjLOv5pKhLaa7lnyXLSfxH7KozHcYpiEAnb+dzn354n7770 DKjzEowyXwrvW+WgyngSjn4= X-Received: by 2002:a05:600c:3b9b:b0:3fe:dd78:8fbc with SMTP id n27-20020a05600c3b9b00b003fedd788fbcmr298664wms.3.1694546893101; Tue, 12 Sep 2023 12:28:13 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id 12-20020a05600c028c00b003fee6e170f9sm13702848wmk.45.2023.09.12.12.28.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 12:28:12 -0700 (PDT) Date: Tue, 12 Sep 2023 21:28:11 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/8] staging: rtl8192e: Use standard ieee80211 function in rtllib_rx_mgt() Message-ID: <26cb0a7758186090a618a134c21e237594bbc525.1694546300.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: 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 (groat.vger.email [0.0.0.0]); Tue, 12 Sep 2023 12:28:50 -0700 (PDT) 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 groat.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776902662467272693 X-GMAIL-MSGID: 1776902662467272693 Replace WLAN_FC_GET_STYPE(le16_to_cpu(header->frame_ctl)) and comparison with standard function to avoid proprietary code and to increase readability. Signed-off-by: Philipp Hortmann --- v1->v2: Unchanged --- drivers/staging/rtl8192e/rtllib_rx.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c index 9f944eefa41e..108238aa61d9 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -2644,14 +2644,11 @@ static void rtllib_rx_mgt(struct rtllib_device *ieee, { struct rtllib_hdr_4addr *header = (struct rtllib_hdr_4addr *)skb->data; - if ((WLAN_FC_GET_STYPE(le16_to_cpu(header->frame_ctl)) != - RTLLIB_STYPE_PROBE_RESP) && - (WLAN_FC_GET_STYPE(le16_to_cpu(header->frame_ctl)) != - RTLLIB_STYPE_BEACON)) + if (!ieee80211_is_probe_resp(header->frame_ctl) && + (!ieee80211_is_beacon(header->frame_ctl))) ieee->last_rx_ps_time = jiffies; - switch (WLAN_FC_GET_STYPE(le16_to_cpu(header->frame_ctl))) { - case RTLLIB_STYPE_BEACON: + if (ieee80211_is_beacon(header->frame_ctl)) { netdev_dbg(ieee->dev, "received BEACON\n"); rtllib_process_probe_response( ieee, (struct rtllib_probe_response *)header, @@ -2661,20 +2658,15 @@ static void rtllib_rx_mgt(struct rtllib_device *ieee, ieee->iw_mode == IW_MODE_INFRA && ieee->link_state == MAC80211_LINKED)) schedule_work(&ieee->ps_task); - - break; - - case RTLLIB_STYPE_PROBE_RESP: + } else if (ieee80211_is_probe_resp(header->frame_ctl)) { netdev_dbg(ieee->dev, "received PROBE RESPONSE\n"); rtllib_process_probe_response(ieee, (struct rtllib_probe_response *)header, stats); - break; - case RTLLIB_STYPE_PROBE_REQ: + } else if (ieee80211_is_probe_req(header->frame_ctl)) { netdev_dbg(ieee->dev, "received PROBE REQUEST\n"); if ((ieee->softmac_features & IEEE_SOFTMAC_PROBERS) && (ieee->iw_mode == IW_MODE_ADHOC && ieee->link_state == MAC80211_LINKED)) rtllib_rx_probe_rq(ieee, skb); - break; } } From patchwork Tue Sep 12 19:28:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 138436 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp677552vqx; Tue, 12 Sep 2023 14:01:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFa4LsfO48LyLgnW4gmoqfX7q5sTRk46nUsJDYoPozxEqbTPykDB75LrDMKz6Mt9SMRMWRw X-Received: by 2002:a17:90b:4d0a:b0:26d:23c3:9f30 with SMTP id mw10-20020a17090b4d0a00b0026d23c39f30mr4846671pjb.14.1694552503206; Tue, 12 Sep 2023 14:01:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694552503; cv=none; d=google.com; s=arc-20160816; b=Kl5E634JAWTmaHhFrLwZMsHAoBwecQB8cRtcetZ9QejGT+Ch0mX+a/YISgTnsu/z2u WYYYdykJnXpi6xeWc6C7JL82Qo3iobVWhwR3tkUGeCWfaaEjcJAObyoNik9vDx6Y1aov metlWSV4+f0Pnkdw4wnLhyA19ukWNzFpR4zred7O/5dEibNmxEBlH6mdwsmm/mHDxXAX yIZY7mHeEtO749Sicvg1WfJXBonsP7ELpkjdZDQ+IixrDQ87LIXRlIrXMlXMIbYxPoDo jiPF9L0FTLU621SSaTjF/0tAlXSqZJJ/bGxtrRwzcm0/FhtczUYPMtre2zfri+noFHmF Im0w== 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=8LmepYLjp69oSf8jB6s9XGuWnA90MLVSQ4b7fLKD3gc=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=ATptnMQvCVic2vIGR12X84ecmcrb0LVCD5Bxuz+ho+aLZEgCugtc7dUtwZ9KFDY9q1 HoQuPLGD9sJ7x6Lv+Oia7UdRwqKGQoZMmwsXUkLipQ/GyJ6LeKHJmOv57pBfbkAnsoQD v0sXs2Zt/bvTd4mdUqLYFmy0oYHNDcX5WiROR9eRX5J5aLivCF42+q8xxzVptJ0clQ3t Wm31gplFroylQ3NWCi7GXJwHcdIypgQXZv7GUd+t6sBWbwy0eYvFmaGe88aIvuQ6Kzw2 8XNnRcZcFZzd47p6cAuZUwTBmULmyXQO0VAiKquIOABlyYYl8luvaECbGXKCYYI1cIEz iPng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=hXiBQJyt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id go19-20020a17090b03d300b00273ce975beesi60453pjb.114.2023.09.12.14.01.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 14:01:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=hXiBQJyt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (Postfix) with ESMTP id C09C6801C502; Tue, 12 Sep 2023 12:28:37 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232806AbjILT22 (ORCPT + 36 others); Tue, 12 Sep 2023 15:28:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237616AbjILT20 (ORCPT ); Tue, 12 Sep 2023 15:28:26 -0400 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B5921706 for ; Tue, 12 Sep 2023 12:28:21 -0700 (PDT) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-401ce65dfc4so18192925e9.0 for ; Tue, 12 Sep 2023 12:28:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694546900; x=1695151700; 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=8LmepYLjp69oSf8jB6s9XGuWnA90MLVSQ4b7fLKD3gc=; b=hXiBQJyt1cpUpbYG9LbCNX1iOXy6WKv1HgCVRk9Sj9RTaE855mHfejZqtUpm3+xyg+ Ile215tDkgI8orOw9L1ZztBrWrmQWThMZpxmukQ+UIrf3ZrkmoEKF6t8cj+/lgDhqzAD GzsdWVP0a2dWe/Vtbty0IKbE6K1W2bmfsj4R36iNhEv5mfpyPKTNbAmRHq7M6vd0qtpb tPSIm3TbcodZuOG7Q4PRi46Bh9CWD6dmASIX+32bcYuuUU+k8z8kG9REfIaeZoU4ljsj NMfyYYljjuEZdGAsAk076pYQzXwes7DsAiYg0r3jXbaP0rQRhFrZU5m/QDWDRFiux+MG OXeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694546900; x=1695151700; 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=8LmepYLjp69oSf8jB6s9XGuWnA90MLVSQ4b7fLKD3gc=; b=eWlNZqteFfLvc+FnkPmMW15dM5pPxzop1QrVHkzsg28uZ0NsErAY3kEBXZP5tb8IYW AVLb421z8AM/UssxxmslVmsu1hKCT59s4Z0Q29OAcA5D0kZCKi2At5khVpfBKP1AShS0 L0qOqJzeAM6VQCqJ9w3h+yDY6+j9qdKxmQsntWConb5vguRhecnl7eXPyzEA7pjl6L3V C8KVv4JbM0G7JfNC+V3Aem5ZXvmBbuZp6KV+Pt4v/rvpevjZKm503yhhDA8o5UrRxqzb IfXOcIRkcWS4wS3Iy4QpfgsvL6p1dx2ieRD5ip90i7zVn3npqf7ZSniyzEUEjaF46Ljw qY/w== X-Gm-Message-State: AOJu0YzFN+FScp7E2BmziWBRpd7as9cRbN5gaUrP2tQ7L3n1Y+K3T1s5 0FRWFhYZU1Cx+c5NCeQm8Zs= X-Received: by 2002:a05:600c:4515:b0:401:b0f8:c26a with SMTP id t21-20020a05600c451500b00401b0f8c26amr300538wmo.4.1694546899943; Tue, 12 Sep 2023 12:28:19 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id e6-20020a05600c218600b003fe1c332810sm16810073wme.33.2023.09.12.12.28.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 12:28:19 -0700 (PDT) Date: Tue, 12 Sep 2023 21:28:18 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/8] staging: rtl8192e: Use standard function in rtllib_process_probe_response() Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: 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 (morse.vger.email [0.0.0.0]); Tue, 12 Sep 2023 12:28:37 -0700 (PDT) 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 morse.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776867085601010918 X-GMAIL-MSGID: 1776867085601010918 Replace proprietary is_beacon() with ieee80211_is_beacon() and proprietary "WLAN_FC_GET_STYPE(frame_ctl) == RTLLIB_STYPE_PROBE_RESP" with standard function to increase readability. Signed-off-by: Philipp Hortmann --- v1->v2: Unchanged --- drivers/staging/rtl8192e/rtllib_rx.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c index 108238aa61d9..89c8d66765fe 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -2448,11 +2448,6 @@ static inline void update_network(struct rtllib_device *ieee, dst->BssCcxVerNumber = src->BssCcxVerNumber; } -static inline int is_beacon(u16 fc) -{ - return (WLAN_FC_GET_STYPE(fc) == RTLLIB_STYPE_BEACON); -} - static int IsPassiveChannel(struct rtllib_device *rtllib, u8 channel) { if (channel > MAX_CHANNEL_NUMBER) { @@ -2491,7 +2486,7 @@ static inline void rtllib_process_probe_response( short renew; struct rtllib_network *network = kzalloc(sizeof(struct rtllib_network), GFP_ATOMIC); - u16 frame_ctl = le16_to_cpu(beacon->header.frame_ctl); + __le16 frame_ctl = beacon->header.frame_ctl; if (!network) return; @@ -2521,14 +2516,14 @@ static inline void rtllib_process_probe_response( netdev_dbg(ieee->dev, "Dropped '%s' ( %pM) via %s.\n", escape_essid(info_element->data, info_element->len), beacon->header.addr3, - is_beacon(frame_ctl) ? "BEACON" : "PROBE RESPONSE"); + ieee80211_is_beacon(frame_ctl) ? "BEACON" : "PROBE RESPONSE"); goto free_network; } if (!rtllib_legal_channel(ieee, network->channel)) goto free_network; - if (WLAN_FC_GET_STYPE(frame_ctl) == RTLLIB_STYPE_PROBE_RESP) { + if (ieee80211_is_probe_resp(frame_ctl)) { if (IsPassiveChannel(ieee, network->channel)) { netdev_info(ieee->dev, "GetScanInfo(): For Global Domain, filter probe response at channel(%d).\n", @@ -2561,7 +2556,7 @@ static inline void rtllib_process_probe_response( else ieee->current_network.buseprotection = false; } - if (is_beacon(frame_ctl)) { + if (ieee80211_is_beacon(frame_ctl)) { if (ieee->link_state >= MAC80211_LINKED) ieee->link_detect_info.NumRecvBcnInPeriod++; } @@ -2597,7 +2592,7 @@ static inline void rtllib_process_probe_response( netdev_dbg(ieee->dev, "Adding '%s' ( %pM) via %s.\n", escape_essid(network->ssid, network->ssid_len), network->bssid, - is_beacon(frame_ctl) ? "BEACON" : "PROBE RESPONSE"); + ieee80211_is_beacon(frame_ctl) ? "BEACON" : "PROBE RESPONSE"); memcpy(target, network, sizeof(*target)); list_add_tail(&target->list, &ieee->network_list); @@ -2607,7 +2602,7 @@ static inline void rtllib_process_probe_response( netdev_dbg(ieee->dev, "Updating '%s' ( %pM) via %s.\n", escape_essid(target->ssid, target->ssid_len), target->bssid, - is_beacon(frame_ctl) ? "BEACON" : "PROBE RESPONSE"); + ieee80211_is_beacon(frame_ctl) ? "BEACON" : "PROBE RESPONSE"); /* we have an entry and we are going to update it. But this * entry may be already expired. In this case we do the same @@ -2628,7 +2623,7 @@ static inline void rtllib_process_probe_response( } spin_unlock_irqrestore(&ieee->lock, flags); - if (is_beacon(frame_ctl) && + if (ieee80211_is_beacon(frame_ctl) && is_same_network(&ieee->current_network, network, (network->ssid_len ? 1 : 0)) && (ieee->link_state == MAC80211_LINKED)) { From patchwork Tue Sep 12 19:28:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 138486 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp744603vqx; Tue, 12 Sep 2023 16:36:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHxc3P8QX14bwkMOYHfAeA+NT2SaybRp30akMZtVvEFJOW0wnQZY5RyJRdXmqeK/KqlhUaw X-Received: by 2002:a05:6a21:621:b0:153:beda:863 with SMTP id ll33-20020a056a21062100b00153beda0863mr825640pzb.45.1694561767400; Tue, 12 Sep 2023 16:36:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694561767; cv=none; d=google.com; s=arc-20160816; b=A7QvWqmsbn8uW49FOSsvn4lEAHwgRAARwwDn8eImkt5ST7viuEk4UpAVaoC6pLOC67 th9GDKXIWpRUMqA/Idx1zU7ZkS7EH/AmpR4Op04L6sGSVeMhjslafAB592viHjOAb3ea Mg2ABEd2qm2gYAdGTeYBuHBZbgEvXYpn7lt4lsQMM6NBHQzLSa6gJCKdOHWvwzBiBZF2 omvRxZsIGOm4F+CTf70ZGZl6GqDTvDIMZNR5M5RCN193A++7qvHM9IinmYbuLie85q1o cudTO1jkXm9O5pPmv3k6uDB/kZ1obuI8j9IPru074Op8udaXE6KB/s1OccJkalnelZ3S vdxg== 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=VFhh3RYguSGZkGRqPmnmCXiDYtANu+EmtRXu+PYPOCI=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=Wd+scOIl9lzmpHrPMZxcPWgfV7iHxMVKp2nZHHWrEWfqZEdVi92e/pIv2iQMn8IQbi mx5m7ExAMiq16harSv7fUP5cw4+IM5Fu5GRHW+7rVUI6tl9kU/TAYqUtfiLz0Q5nq26w kAD8zO2lMpprApXo2+A40K3YAbdJuLKcSQZckRv2/pZw2h+UuNRuDxJRHLypKyE7+aqL U4C2jZTzTk/TlOESgZNTCBubuvUfBtGY/+SuQTDaIKb0fEBw95tgAvI6seakWdNyHv6H eBAe9GipWILn9/J/pXQmfKP9s8Dq5QXBQ43425NNXVIOu5TnpgeMTlH+zSWpP43Me74j MSDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=TD8fwNEB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id b7-20020a170902650700b001baff05d890si8662901plk.313.2023.09.12.16.36.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 16:36:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=TD8fwNEB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (Postfix) with ESMTP id 9D16081ADD4C; Tue, 12 Sep 2023 12:28:37 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237625AbjILT2e (ORCPT + 36 others); Tue, 12 Sep 2023 15:28:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49830 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235851AbjILT2c (ORCPT ); Tue, 12 Sep 2023 15:28:32 -0400 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C7B2E199 for ; Tue, 12 Sep 2023 12:28:28 -0700 (PDT) Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-401e6ce2d9fso17514355e9.1 for ; Tue, 12 Sep 2023 12:28:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694546907; x=1695151707; 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=VFhh3RYguSGZkGRqPmnmCXiDYtANu+EmtRXu+PYPOCI=; b=TD8fwNEB0ggJEY5mQyRUFyCA/icXFZariJH2zpYQ94Q/JaZygT1mjg/NsrMD6tEGfW A8vaVHrIvr05Pza9c2f6Rf47AYXoCcNDifpOj85CVdKcWCUqitrv0Vo/jdd4rVSB5hjL nwVBxb5NUhj0pGniZn4VqpYpeZJp1u22+GTD46LBXxI2QMpPBvx14PdM+wnWQx3CZJiQ II6+ZV/HmbyRvxdKU7LxEnN2VKNRY1DSwOYbPyvdYdKMnZaJAcCsnrVan9KQKbhw4FKg cpsIAzybvJGAB9pU9B03pSDtoe+WhGwymefqlMLEPdip+JrJ7yPY77kR6ZJVQRRFbmub ehBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694546907; x=1695151707; 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=VFhh3RYguSGZkGRqPmnmCXiDYtANu+EmtRXu+PYPOCI=; b=Lf1Ioq6eY7TvhsHDXtEf2xO43yv90Z0LSuM2bpdBNcLaot+5nEoJcbwGKBs2SGEqPz TRGZ8n+GOZdQt6vTppj2TljTIByGRgN7DONxjFRn2CcAnFH/zyuiaKvxqMNzkTsTJ8mS nXraH+3aYqMgbZ2jax4Sfa97OwxNqPDniFmLC61WpBblTDOs5ECyqGnP3esJhRifvc/i eICbeXnu6EKcYS6CMt9drHVWpxJRToLwLTuFaue5OSSQM7qIQQ1U7DzHRDYnpSrh7JW7 1HpU99ZU8b0rdCu6qPkWG6yvBbfMPPtgrAChYNJSsBcNS9L5R6fAZmdbLeC7V/SEgjT0 LWDA== X-Gm-Message-State: AOJu0Yw5oHXHCYxdMuIV2DGz7IC6MKCdAiQfYlFhllGwQ2QVxUQZa+nQ 04J0AGUTQaRw0Tj+To/4Cr5u/U60sd7LXQ== X-Received: by 2002:a05:600c:314b:b0:401:c6a2:3cd5 with SMTP id h11-20020a05600c314b00b00401c6a23cd5mr299818wmo.2.1694546906801; Tue, 12 Sep 2023 12:28:26 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id l40-20020a05600c1d2800b00402f7b50517sm13840629wms.40.2023.09.12.12.28.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 12:28:26 -0700 (PDT) Date: Tue, 12 Sep 2023 21:28:25 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/8] staging: rtl8192e: Use standard function in rtllib_rx_check_duplicate() Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: 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 (agentk.vger.email [0.0.0.0]); Tue, 12 Sep 2023 12:28:37 -0700 (PDT) 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 agentk.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776876799399556139 X-GMAIL-MSGID: 1776876799399556139 Use standard function ieee80211_is_beacon() to avoid proprietary code and to increase readability. Signed-off-by: Philipp Hortmann --- v1->v2: Take wrongly removed definition of fc back in. --- drivers/staging/rtl8192e/rtllib_rx.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c index 89c8d66765fe..7c16d4db67ad 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -904,11 +904,9 @@ static int rtllib_rx_check_duplicate(struct rtllib_device *ieee, { struct rtllib_hdr_4addr *hdr = (struct rtllib_hdr_4addr *)skb->data; u16 fc, sc; - u8 frag, type, stype; + u8 frag; fc = le16_to_cpu(hdr->frame_ctl); - type = WLAN_FC_GET_TYPE(fc); - stype = WLAN_FC_GET_STYPE(fc); sc = le16_to_cpu(hdr->seq_ctl); frag = WLAN_GET_SEQ_FRAG(sc); @@ -916,8 +914,7 @@ static int rtllib_rx_check_duplicate(struct rtllib_device *ieee, !ieee->current_network.qos_data.active || !IsDataFrame(skb->data) || IsLegacyDataFrame(skb->data)) { - if (!((type == RTLLIB_FTYPE_MGMT) && - (stype == RTLLIB_STYPE_BEACON))) { + if (!ieee80211_is_beacon(hdr->frame_ctl)) { if (is_duplicate_packet(ieee, hdr)) return -1; } From patchwork Tue Sep 12 19:28:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 138434 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp675699vqx; Tue, 12 Sep 2023 13:58:04 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGNQQLUKauKYHMdx4CRl8izvBdzCTZDiguYbxii+/45C0vvS0sAHMSflqRpQkAc5/otIxYI X-Received: by 2002:a05:6a00:15d0:b0:68b:ff3b:e14a with SMTP id o16-20020a056a0015d000b0068bff3be14amr960193pfu.18.1694552284161; Tue, 12 Sep 2023 13:58:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694552284; cv=none; d=google.com; s=arc-20160816; b=p9XM7VlKseVwY8tsny6xbqTvi9K5sV0b1www0a/f4ITO8ay1lmfhCMuwVXD/TWdTgc Nn4oLPadS7biQAKIPUB93NaNmj+YPju6o0x8QXoDr66TECIS/UDiZwA0fp/iFQxTQnQu uHb/Zqy94W0rmbizwe/23CduayfyTgQ7BBOfaqVONCI5JeW1RbQwx2Hjk1XwP7xHbKUG FarX9NSGY8qBbmFcHu+OozLqvXn6QnwSbiFykRIalORPvF5Q4sTibHAbMJiiKqJVrlBF Pl+gw/2pVfLPgEcLjxM56lGaZzKXQZgpkVIiCily8wS8Di51KgTQh+Siru8DHGOspm3q OT4g== 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=jUSgJtFk7zn2O1gmuDqCli3+YafBtkOy6GThkBfBxcY=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=vxRPdI3k5p6TMOjoXtE3SKxyqeQX/XlM4er9qf7tge2CPXJfeRniz5mwGLrlvCLRIM SobZpqEGPEjlvmyxrwPYZ5E4VcIO5yef0oZPthaUlE64jKV4w24FDm2OX8apm9SFVAaj Z83gOKCo0+kFUp3Ix0GLUas0mK8zbOZLprlzXuh9rkGGiIxJCnkJMbAhLaZJIbOvNLxk Qgayk4KD6rJ1lI7xSuz0qTs5d1nQYgjPjdz+SYS6rWRz+MVEouuPWAoLnXSI92GQ3ih4 UBL3I8pS9TylipKFWfdHduX7Yo60JUJQxm3nSCgk8w6AUwAhy9bB0DbsLByDWU74XDo/ pSCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=kz+JbS2y; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id w8-20020a63f508000000b00563f4e46f7esi8582798pgh.287.2023.09.12.13.58.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 13:58:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=kz+JbS2y; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (Postfix) with ESMTP id 0BEB7824686E; Tue, 12 Sep 2023 12:28:56 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237634AbjILT2m (ORCPT + 36 others); Tue, 12 Sep 2023 15:28:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237628AbjILT2i (ORCPT ); Tue, 12 Sep 2023 15:28:38 -0400 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8AA3B1702 for ; Tue, 12 Sep 2023 12:28:34 -0700 (PDT) Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-401314e7838so18390745e9.1 for ; Tue, 12 Sep 2023 12:28:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694546913; x=1695151713; 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=jUSgJtFk7zn2O1gmuDqCli3+YafBtkOy6GThkBfBxcY=; b=kz+JbS2y0/hhsN9PO9Jz808+t+Xa+r1hoSIHeWfi9JJtamTsC2lQuninsYj3+o5dqz F9ejAjk4YjrDzL5RKMEWRtzjCwLvkkKy1JP73xUJQESfbpuDUzaQVLdGZ+rdR4MbxfxT iJidVpAWTkrWd1b+XTkpMnh6RipcNX68RxN8tTS93zk471CcZCZbBsbXms4JiEZmSeG8 bAEoeunoXWjlSi5RbDiNIPjvdjxma2L+cHLRA6jhUTkJuC5Su3XxqAfOBjvnUm2BPerb dCrYTOq6ae/AxPbKc3imaJfp/yvkmV7Gbl1km0AkY3bViJZnFV7uyFrtKbNF+ytAz4nX nLkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694546913; x=1695151713; 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=jUSgJtFk7zn2O1gmuDqCli3+YafBtkOy6GThkBfBxcY=; b=XNkC48tndUZ9wDBFC0RGAZp91jNehhFbEPJYFGVZokzl6ChUfGtuO/RcGy6nkeA4IK G+hUfiOxrbP988r2bNSy7IF93tl3DrcQXUG+u3ohBhgvdKApaVQUZdR8C0SYOSqYJxaJ 0JLBWQjPEnHy9cztTzeBP9Dg7mI5yXBqvkBaqtTCXl27UEHkApHp1weBFJ5E37M7r9SZ ssPpNyX8bguaSb05YREYQGmoa/XqS8dKpMu8EELKozJoWJZT7McrN+nUtiKJzak8bgIR kWaipLUO8UgNTkFL44oy7jSMpTZW2o5GAReFM/kMW9FQ6ApMFwplb4ewaKM1Z9TEMrtR u+Fw== X-Gm-Message-State: AOJu0YxRnEvnTDkya7HwEmoPY3HP0ws1XQfFrItrab9XfVj0Di7w1QDi PeyjsolEKrieJTp+EDgr2bppt3HSkM9Bmw== X-Received: by 2002:a05:600c:1c0d:b0:401:c07f:72bd with SMTP id j13-20020a05600c1c0d00b00401c07f72bdmr276361wms.4.1694546912952; Tue, 12 Sep 2023 12:28:32 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id e6-20020a05600c218600b003fe1c332810sm16810452wme.33.2023.09.12.12.28.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 12:28:32 -0700 (PDT) Date: Tue, 12 Sep 2023 21:28:31 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 5/8] staging: rtl8192e: Use standard function in softmac_mgmt_xmit() Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: 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 (groat.vger.email [0.0.0.0]); Tue, 12 Sep 2023 12:28:56 -0700 (PDT) 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 groat.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776866855582796043 X-GMAIL-MSGID: 1776866855582796043 Use standard function ieee80211_is_beacon() to avoid proprietary code to identify beacon and to increase readability in softmac_mgmt_xmit() and _rtl92e_translate_rx_signal_stats() Signed-off-by: Philipp Hortmann --- v1->v2: Unchanged --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +- drivers/staging/rtl8192e/rtllib.h | 1 - drivers/staging/rtl8192e/rtllib_softmac.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index 58e90b7772ef..8adf53174239 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -1584,7 +1584,7 @@ static void _rtl92e_translate_rx_signal_stats(struct net_device *dev, (!pstats->bHwError) && (!pstats->bCRC) && (!pstats->bICV)); bpacket_toself = bpacket_match_bssid && /* check this */ ether_addr_equal(praddr, priv->rtllib->dev->dev_addr); - if (WLAN_FC_GET_FRAMETYPE(fc) == RTLLIB_STYPE_BEACON) + if (ieee80211_is_beacon(hdr->frame_ctl)) bPacketBeacon = true; _rtl92e_process_phyinfo(priv, tmp_buf, &previous_stats, pstats); _rtl92e_query_rxphystatus(priv, pstats, pdesc, pdrvinfo, diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index 95c9f6679d71..7dfb93f0590c 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -459,7 +459,6 @@ enum _REG_PREAMBLE_MODE { #define WLAN_FC_GET_STYPE(fc) ((fc) & RTLLIB_FCTL_STYPE) #define WLAN_FC_MORE_DATA(fc) ((fc) & RTLLIB_FCTL_MOREDATA) -#define WLAN_FC_GET_FRAMETYPE(fc) ((fc) & RTLLIB_FCTL_FRAMETYPE) #define WLAN_GET_SEQ_FRAG(seq) ((seq) & RTLLIB_SCTL_FRAG) #define WLAN_GET_SEQ_SEQ(seq) (((seq) & RTLLIB_SCTL_SEQ) >> 4) diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c index de1702491191..5de57331c1cf 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -197,7 +197,7 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, struct rtllib_device *ieee) /* called with 2nd param 0, no mgmt lock required */ rtllib_sta_wakeup(ieee, 0); - if (le16_to_cpu(header->frame_ctl) == RTLLIB_STYPE_BEACON) + if (ieee80211_is_beacon(header->frame_ctl)) tcb_desc->queue_index = BEACON_QUEUE; else tcb_desc->queue_index = MGNT_QUEUE; From patchwork Tue Sep 12 19:28:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 138475 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp729827vqx; Tue, 12 Sep 2023 16:01:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF2xXjX/Xlqeszrj8SRvY3F3uZZznqCmXN1N4O71IcyOZOdCDMoh3zJvSUqHxBvKiPSc2o4 X-Received: by 2002:a17:902:e745:b0:1c3:2ee6:380d with SMTP id p5-20020a170902e74500b001c32ee6380dmr1201737plf.48.1694559707531; Tue, 12 Sep 2023 16:01:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694559707; cv=none; d=google.com; s=arc-20160816; b=nqistzIqmdk98a0j4gWKRlnX1WEkVBHpWJmISszrYpbcMuqPGZjdnawvZiu6/TG9wR Zi4xcttjjTMxhFQIjkHgLPiYpPUyHwH5wxyLBjc1vr1T8d7p4s7X5x6uvpnXghFB3Z5F 6cGja+YU4iBAqw91dBHCoycXDsHnaGPClM/ZEVQkiO7TKbSOUGd+QCzmQOMJ8CIVj1Km 5RnFvrNw/L1Sdjp/FOIcHpvZBm3ncbImkGjOchdlyENQnolf7vgZOoD8G3Gclor3AQVz GTvlZYRaTK+5pJb6AW9UambTpbMWkW36CafV8Q6XsKcmiiJRjqCCES3R4Xla5IREyHhF d0+A== 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=nytdb2jTBTDlZWB9THAVoMMoHv0wERJG7iM7Ci7CqjE=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=ru3C+oXSdPsgU6l/kq5uaBqfqUeHslgPAQLbeRr0VfYAa9c1T/22UzIqJS34ynyE+j Gxgu887NWzGsmh1R9uVUc+6uVkdluOQphlHkfngJgv6Zmzs7b1Cn4Z8s7q8V5tV+yIpm fA8Bn5yh/wjuKe6M4y0PqaEcnBeXk0wvT0RYv8age4rtv9Ya4X+iBD0Jw94rshinK9BH upZZHwqqQMoq0X/bkXCPIsTxIchpNTuc41VPJQ4z/oO9pXpB+iI1YdVmn+SjwwsxvE9V uJx2cWCWO8Sy7yb2Cx4Z/f/YjkJd631DWqVJi5iv2Ljui0VzTBJgUz7PpZRUlEqmAsEU 73uQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=N4bg8Y+x; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id u15-20020a170902e5cf00b001b886728cddsi9464508plf.416.2023.09.12.16.01.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 16:01:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=N4bg8Y+x; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (Postfix) with ESMTP id C4E2183014AD; Tue, 12 Sep 2023 12:29:16 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237644AbjILT2v (ORCPT + 36 others); Tue, 12 Sep 2023 15:28:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237629AbjILT2p (ORCPT ); Tue, 12 Sep 2023 15:28:45 -0400 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1079910D0 for ; Tue, 12 Sep 2023 12:28:41 -0700 (PDT) Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-31c49de7a41so898155f8f.1 for ; Tue, 12 Sep 2023 12:28:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694546919; x=1695151719; 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=nytdb2jTBTDlZWB9THAVoMMoHv0wERJG7iM7Ci7CqjE=; b=N4bg8Y+xIypOVFi+rShomsZwg3T/6pSob0jbqO5NpHdcAEOjOmOiC9Wiixt9x9LEsQ o95Uv+k6WEQroslOWCVUVEfRars+4RjSC/Vfi7DZqMfWdn11K9VzY++1GdMSr2UQdjGu QS5+FxVzVIwYhH2D/SRm/mrG6pANPH+O+phFl+SVap41vBz4pNngr+/w8sY05QLvmbk2 doR5f7PicfWVR3584LxJEqq1tNpsKOkZRcXkGoGRzad8z5t5xaHktVp3oNC32f4RAYzx 81Vozel84qCbziMMFfICp0Wx6pSS5f9VfEd+ZUuZ1sTM5C7Ls6kk//EpbXyza6PLFGJL cKWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694546919; x=1695151719; 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=nytdb2jTBTDlZWB9THAVoMMoHv0wERJG7iM7Ci7CqjE=; b=P20HsHnfdjRN2XSgUg3SlDtYS7tgouHfh/vKogDzcvK2UBmyR5Bf27PP9Z4zbDWY5h brB5cmfe5BObu0bVJCv32z1Hk8y5fAXUBxZ2fppnAl4A0FX3m6sHoXouTWs+8rolFT1+ WHIyYqxG83oOfB8/YuR6uFbPjr7G/qgNWVBNniW0fsCNcsRK+ZE25gCj12wpCgDgjLMv vtSCDXPD2T4E7ctbiKRty53+Z0weA5JgcAYQRdXukpqbJTZMSfgBE6lCx45h2C4feLCp X3DIyq/+aHwQTf3PeViila7tNv4IBcwousCNKOrtbaD+3syVehW6rSRiXSOLTjEa3lug uBqA== X-Gm-Message-State: AOJu0YwJtrsRM1jie+NJmuGelME2IS6T17xwDN+I2NUz6dgBDWCcZCTH D1eCasGkrmFAkvA8P8w34YQ= X-Received: by 2002:adf:f0c2:0:b0:31f:af30:1bd4 with SMTP id x2-20020adff0c2000000b0031faf301bd4mr339777wro.1.1694546919469; Tue, 12 Sep 2023 12:28:39 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id q17-20020adff511000000b00317f3fd21b7sm13642874wro.80.2023.09.12.12.28.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 12:28:39 -0700 (PDT) Date: Tue, 12 Sep 2023 21:28:37 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 6/8] staging: rtl8192e: Replace rtl92e_disable_irq with rtl92e_irq_disable Message-ID: <07c7312d1571e23ee382d47095931d68ba194551.1694546300.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: 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 (groat.vger.email [0.0.0.0]); Tue, 12 Sep 2023 12:29:16 -0700 (PDT) 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 groat.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776874639744554184 X-GMAIL-MSGID: 1776874639744554184 Replace rtl92e_disable_irq with rtl92e_irq_disable to increase readability. priv->irq_enabled = 0 was set in both functions. Signed-off-by: Philipp Hortmann --- v1->v2: Unchanged --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h | 1 - drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 9 --------- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index 8adf53174239..e0500946dea5 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -1879,7 +1879,7 @@ void rtl92e_enable_irq(struct net_device *dev) rtl92e_writel(dev, INTA_MASK, priv->irq_mask[0]); } -void rtl92e_disable_irq(struct net_device *dev) +void rtl92e_irq_disable(struct net_device *dev) { struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h index 11366fda4ec3..3c06e1da4408 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h @@ -17,7 +17,6 @@ void rtl92e_ack_irq(struct net_device *dev, u32 *p_inta); void rtl92e_enable_rx(struct net_device *dev); void rtl92e_enable_tx(struct net_device *dev); void rtl92e_enable_irq(struct net_device *dev); -void rtl92e_disable_irq(struct net_device *dev); void rtl92e_init_variables(struct net_device *dev); void rtl92e_start_beacon(struct net_device *dev); void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index 50eb8f3494ec..055cd513d76a 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -236,15 +236,6 @@ void rtl92e_irq_enable(struct net_device *dev) rtl92e_enable_irq(dev); } -void rtl92e_irq_disable(struct net_device *dev) -{ - struct r8192_priv *priv = rtllib_priv(dev); - - rtl92e_disable_irq(dev); - - priv->irq_enabled = 0; -} - static void _rtl92e_set_chan(struct net_device *dev, short ch) { struct r8192_priv *priv = rtllib_priv(dev); From patchwork Tue Sep 12 19:28:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 138448 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp697606vqx; Tue, 12 Sep 2023 14:46:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGRU5f9tY3AN0EEftdKZMbgMXwqII55qIvY7D63uUsftQzxtzvXSJy5HZNKYoDsx1dFDU9Q X-Received: by 2002:a54:4511:0:b0:3a7:6213:6897 with SMTP id l17-20020a544511000000b003a762136897mr990061oil.11.1694555190874; Tue, 12 Sep 2023 14:46:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694555190; cv=none; d=google.com; s=arc-20160816; b=GSwtpq0h4N394+OKPBE9EWkSjy1Z2kM3GY9obfQ8ozTnldyDj7wymtYnyuA3SbDdaa TMax8aJODTRx/oDEsWygGg0kQ8wJlW3WvMet3tksdlA1bN1E/kA4raz7rUCWZ93/PtjU 1e5s0LXxWBnrBrC/yw3qXRV7V5ro0x1e3xZtrIdNrwilFLnEPMFrnmHrxqMsLClYWxSb qkXcfnd4grQpBbMIDBYwKdfrJaSxd2eEUIl/C1xWkkpYxO6wfFJmxt9fLDdzy7fVxSrf 51Xlb6DTWKhB4ytCKy8E5f8pCMBgJ7MQoaVHxXoLWMO8vtMnk825rn74hR1ISiVWgt4j F6eg== 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=5uIdBMaIxfi6eKcNWe6YvWQH/LhS5SQKFcSkjVp8eYk=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=WzyNmEDqxmCevEOTAPrug8rGd5E85dXVTxyostuJJrhEc/gt37UHNeOUJlzDEvWojU dwfIq4AqosxA+AetBtCfLCYRVr+529U7SYNfiu2zAdhdcXv9yLuR2OBHHNTkSn7286px wkqFvqxUgsS70azQPVrfAKK9/O9nqXAPOkQzJ6ZwvGZ+fySm5nBx6N7YI8XlPYoAwIIh F+JgECISk2CYVyjKDQQvrucY01gWsFP+Y/Nbj+R2s1ChsudRU6QbAEN+BNs+rhOZJ4LI mW8LKPFdJqzTiBbktvjDZIUDE4in1w9e2EHjZRMPXcCUzzYldcw3i169R88pRSfAFUy0 mrxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=Ot0bbmJQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id bg26-20020a056a02011a00b0054fbd904b6dsi8504524pgb.500.2023.09.12.14.46.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 14:46:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=Ot0bbmJQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 fry.vger.email (Postfix) with ESMTP id 49CEF81F54FD; Tue, 12 Sep 2023 12:29:05 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237640AbjILT25 (ORCPT + 36 others); Tue, 12 Sep 2023 15:28:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237662AbjILT2x (ORCPT ); Tue, 12 Sep 2023 15:28:53 -0400 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F0961706 for ; Tue, 12 Sep 2023 12:28:49 -0700 (PDT) Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-401e6ce2d9fso17515055e9.1 for ; Tue, 12 Sep 2023 12:28:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694546927; x=1695151727; 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=5uIdBMaIxfi6eKcNWe6YvWQH/LhS5SQKFcSkjVp8eYk=; b=Ot0bbmJQrFw8DUXVvysu6JP/ZmnyQ5nX5otLtQrpXH44WzefRGKd59OsMQl4AM47Bb RWK0/SKKdCfHt+iG2wD9LzxSHsV34my1PoZ7du7pg+kLudlwNlnK1q6Xi0CoAvSTgwWy RndWoUFSEtHCcXNMd8Sk9hDZh2/tFt2htVpuD2EqbgUVxYqivnd60Fcskty26s7jX0Z2 S61ZevuF4PF0a+r+UD7FX3Lkw9Z0djS9zMHmdrz97WpHxQCg9XBoT6VSE/fGunavm5/X rfz+P9tegOMTpBdSMx1RcheA5bdrHQBR6er+28+QIj9VA1PYO5hde3eoUDXZlcO0gO8b P2Uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694546927; x=1695151727; 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=5uIdBMaIxfi6eKcNWe6YvWQH/LhS5SQKFcSkjVp8eYk=; b=qN+4qCH6g9h1r9cf1OljdKK/dG61XI3WWGgIP8MTXDOSglg1WQDCdxddOYaMSgFvyj WGoIXDFUOaqFnqWUSbG7ltBTmJB7ftU6eYFS3uc3VUj0twfxr2UrewAo1oJVqRUZ5GDG RJRbmH94kl9+dsgCBeWqOkUos+Ko7cQrPd3UAgeN2TKQv7xs09jHl4HyI7KD1AZiG9b1 kzvOfibnAYWLWFy9zdb34QCietbP0iSi2G1XesnZawas3TlRa0TM/o0WyYHtXzzEw7OC mZ5ppBfQO9kHo1+I1wTcab0AKKTa1MWP3QX0N2H49EbEMihqquCigApNqBYoT7Ctvi8Z +SXA== X-Gm-Message-State: AOJu0YxM5aqx7VO0CUOUBx0PaCzkTMsRsqGo7SsRaIHZET2ow0tvd2/7 KMY3ieaJ3MjuaB7CewhiuOI= X-Received: by 2002:a05:600c:34ce:b0:401:bb6e:453a with SMTP id d14-20020a05600c34ce00b00401bb6e453amr352307wmq.0.1694546927516; Tue, 12 Sep 2023 12:28:47 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id c25-20020a05600c0ad900b003fee567235bsm16953674wmr.1.2023.09.12.12.28.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 12:28:47 -0700 (PDT) Date: Tue, 12 Sep 2023 21:28:45 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 7/8] staging: rtl8192e: Replace rtl92e_enable_irq with rtl92e_irq_enable Message-ID: <6e8167402d279299e3ccf3468021abb0699d0e8e.1694546300.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: 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 (fry.vger.email [0.0.0.0]); Tue, 12 Sep 2023 12:29:05 -0700 (PDT) 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 fry.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776869904131212762 X-GMAIL-MSGID: 1776869904131212762 Replace rtl92e_enable_irq with rtl92e_irq_enable to increase readability. priv->irq_enabled = 1 was set in both functions. Signed-off-by: Philipp Hortmann --- v1->v2: Unchanged --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h | 1 - drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 9 --------- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index e0500946dea5..70e1eff9c600 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -1870,7 +1870,7 @@ rtl92e_init_variables(struct net_device *dev) priv->bfirst_after_down = false; } -void rtl92e_enable_irq(struct net_device *dev) +void rtl92e_irq_enable(struct net_device *dev) { struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h index 3c06e1da4408..14a091ae1b7d 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h @@ -16,7 +16,6 @@ bool rtl92e_is_rx_stuck(struct net_device *dev); void rtl92e_ack_irq(struct net_device *dev, u32 *p_inta); void rtl92e_enable_rx(struct net_device *dev); void rtl92e_enable_tx(struct net_device *dev); -void rtl92e_enable_irq(struct net_device *dev); void rtl92e_init_variables(struct net_device *dev); void rtl92e_start_beacon(struct net_device *dev); void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index 055cd513d76a..63bf8be3fda5 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -227,15 +227,6 @@ static void _rtl92e_tx_timeout(struct net_device *dev, unsigned int txqueue) netdev_info(dev, "TXTIMEOUT"); } -void rtl92e_irq_enable(struct net_device *dev) -{ - struct r8192_priv *priv = rtllib_priv(dev); - - priv->irq_enabled = 1; - - rtl92e_enable_irq(dev); -} - static void _rtl92e_set_chan(struct net_device *dev, short ch) { struct r8192_priv *priv = rtllib_priv(dev); From patchwork Tue Sep 12 19:28:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 138427 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp665952vqx; Tue, 12 Sep 2023 13:35:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEhgZ/ePj7e+AemezeVB26cOZqcnv5biwBX629RUd+1oj28u7tKFYiNsQfa4Xt9Fu+xK58O X-Received: by 2002:a17:902:f54d:b0:1c3:76c4:7242 with SMTP id h13-20020a170902f54d00b001c376c47242mr1094651plf.22.1694550952226; Tue, 12 Sep 2023 13:35:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694550952; cv=none; d=google.com; s=arc-20160816; b=JXQYbUEV7vX37LjD7aYY462UOHzB+mGJgHwjZ7HnYHkh3aYMafyYBI+reV+KP2pF7/ UnJJo5ilZTtXF+t3Mb4prq1Bg4s1Ydh8O7OFX0Ialom4m6ipjoV4QEitLTxUhTkRxqYV OQ/OEJA/Yejq4j9j+xd/4/BCMckUGaNaW87d1YBTLMhrPsKpjVzR0h9zretbwILV5P0T rpob6CLUXX2fS0YAPke3Gy5Q5P+3EAQ3Wfowq0Luivm5vrZTPDZd0si1enpDzhREsjDB LiLX4HqqBwzqMklSY8o4mqmz4p48BObPmxICfm/hvmotU97q4fa8CQB2Q4q8sq2hUXu8 jnQQ== 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=f9QOFf4TBJHbEExXLmv/GmW03P0dycuuh5jJHz9YFN0=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=w6rD1Pz4rWGNMEZYyvb/g4VDdNjjZxquOdNUralCPzlZXVQkQLuMFb4cWxG3Hr46wn SF44RZjtlLE1ljAQLf8TapEI2VCTVEeVNFvUtbUeOCZpI6OTtwAMNfIlD5DNaT/RKFB/ zsE5hckIu8SGH4LG6kF9MFN9ZCHS0+YuhoVk70qZCtF9RSPiHRRfvK8D9t7gPfYXfzGi aNWHdRf6cDGAwYEzhKFqxTQszZexSvDaUTq1eW3tsK5Q9VznNXVGwjvMIq82TUDQjMM0 HIiKOaVY/vj8Fm7HnwiaJUEbPsYB76vd91G4nut0FkxORLqXCOOzi5XQMjDiAcfMiryG BZ9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=nnFJKFcJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id b11-20020a170902650b00b001bde9e8a29fsi8463736plk.183.2023.09.12.13.35.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 13:35:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=nnFJKFcJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 fry.vger.email (Postfix) with ESMTP id B8FFA8253506; Tue, 12 Sep 2023 12:29:17 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237675AbjILT3D (ORCPT + 36 others); Tue, 12 Sep 2023 15:29:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236751AbjILT3A (ORCPT ); Tue, 12 Sep 2023 15:29:00 -0400 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 71B60170B for ; Tue, 12 Sep 2023 12:28:56 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-3175e1bb38cso972302f8f.1 for ; Tue, 12 Sep 2023 12:28:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694546935; x=1695151735; 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=f9QOFf4TBJHbEExXLmv/GmW03P0dycuuh5jJHz9YFN0=; b=nnFJKFcJOPKI93ZMgy8MqeGx/0bDTETSX+8fSqm9Mx2oGi1WrAQdZgS9m8KDv2zy6W haX6Yg7HCIMPBYFoHsRifOYQ+HRhcvC7yk/3Ic2QI+LjWf1SNYM52yQN7J9qGrU7TnAp Pa1GzXk5nPZxQ0uj5JCl/xiFKvTzJLpQwmQF7qBD//SxlKpr9rgCf/iuT8Dw6Sb8HIue z6tcbo1ypolB4vclSSwxPLxFYdDN/15Dqinn94q/SI6axVs9/6RJMhDm+U/XHEvp2iUf CEf3yN97UuA52EtK9MhF1jTVI6jqdFOKYTiSR2w9uYCCqHmH6oyTMRkJak/MCNyGc/KV dxXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694546935; x=1695151735; 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=f9QOFf4TBJHbEExXLmv/GmW03P0dycuuh5jJHz9YFN0=; b=Yh/Eqir3CeyqNyBnM5Wf1Y1Rly0ICJR6zIHqHcYyzwy1fp3eVoEa3F5rQdJH7OE8Op OF9NjrZTOL5TejqtYFkMY61DTRkNeH4g1by+Kdu2rnpysVDH6F/z/TmRgcPyIwtFeuZ6 X9n/u1ED8w/IcDG7EbyGlvshEmIuspqrkX4Awm708XDK8JdulO0uX7NJX0UmdZK15i/J dnKTA5pvojgU3wgtCktUrzB+P8wbgx3sWS5GxHJuD69azeDoQ5bC8oVgYet+HtgOIK2l S8GpI9f+p53rUoXz06OwP3Xr20SIcXUjHdUx+zv3G6+S2ZPWuLIwFxx6BDSxobNkjxit b8DA== X-Gm-Message-State: AOJu0Yyh98sbyIh6pNI6KhUgEJdcv+nKOJGE9FdRC8NYJxOpg1cXGHP8 Jv//eAbtyMYJOqZMy0Tc1rY= X-Received: by 2002:a5d:5651:0:b0:31a:e21f:37ef with SMTP id j17-20020a5d5651000000b0031ae21f37efmr392517wrw.3.1694546934906; Tue, 12 Sep 2023 12:28:54 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id q15-20020adfcd8f000000b0031753073abcsm13509097wrj.36.2023.09.12.12.28.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 12:28:54 -0700 (PDT) Date: Tue, 12 Sep 2023 21:28:53 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 8/8] staging: rtl8192e: Remove rtllib_get_payload() Message-ID: <3ef288fb819f50da3eb9291522067babaa57f532.1694546301.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: 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 (fry.vger.email [0.0.0.0]); Tue, 12 Sep 2023 12:29:17 -0700 (PDT) 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 fry.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776865459178374284 X-GMAIL-MSGID: 1776865459178374284 rtllib_process_action() is only called in one place with management frames. Frame is passed over to rtllib_get_payload() which passes it to rtllib_get_hdrlen(). In rtllib_get_hdrlen() all management frames return with hdrlen = RTLLIB_3ADDR_LEN. Therefore the switch in rtllib_get_payload() is useless and dead code. The condition act == NULL cannot occur and can also be removed. Then rtllib_hdr_2addr is not used anymore and can be removed as well. Signed-off-by: Philipp Hortmann --- v1->v2: Unchanged --- drivers/staging/rtl8192e/rtllib.h | 23 ----------------------- drivers/staging/rtl8192e/rtllib_softmac.c | 9 +-------- 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index 7dfb93f0590c..565a6e41b982 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -692,14 +692,6 @@ struct rtllib_hdr_1addr { u8 payload[]; } __packed; -struct rtllib_hdr_2addr { - __le16 frame_ctl; - __le16 duration_id; - u8 addr1[ETH_ALEN]; - u8 addr2[ETH_ALEN]; - u8 payload[]; -} __packed; - struct rtllib_hdr_3addr { __le16 frame_ctl; __le16 duration_id; @@ -1781,21 +1773,6 @@ static inline int rtllib_get_hdrlen(u16 fc) return hdrlen; } -static inline u8 *rtllib_get_payload(struct rtllib_hdr *hdr) -{ - switch (rtllib_get_hdrlen(le16_to_cpu(hdr->frame_ctl))) { - case RTLLIB_1ADDR_LEN: - return ((struct rtllib_hdr_1addr *)hdr)->payload; - case RTLLIB_2ADDR_LEN: - return ((struct rtllib_hdr_2addr *)hdr)->payload; - case RTLLIB_3ADDR_LEN: - return ((struct rtllib_hdr_3addr *)hdr)->payload; - case RTLLIB_4ADDR_LEN: - return ((struct rtllib_hdr_4addr *)hdr)->payload; - } - return NULL; -} - static inline int rtllib_is_ofdm_rate(u8 rate) { switch (rate & ~RTLLIB_BASIC_RATE_MASK) { diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c index 5de57331c1cf..904be0ef867f 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -1921,16 +1921,9 @@ EXPORT_SYMBOL(rtllib_ps_tx_ack); static void rtllib_process_action(struct rtllib_device *ieee, struct sk_buff *skb) { - struct rtllib_hdr_3addr *header = (struct rtllib_hdr_3addr *)skb->data; - u8 *act = rtllib_get_payload((struct rtllib_hdr *)header); + u8 *act = skb->data + RTLLIB_3ADDR_LEN; u8 category = 0; - if (act == NULL) { - netdev_warn(ieee->dev, - "Error getting payload of action frame\n"); - return; - } - category = *act; act++; switch (category) {