From patchwork Fri Sep 15 16:09:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 140677 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp1305585vqi; Fri, 15 Sep 2023 13:36:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGiFKCtsCbVvV5eTyTQiMrIDK5PqL8wtSGSFRMPV6Um2nJg4p4LckY6/Byxk1lyST6ahzaw X-Received: by 2002:a17:902:8684:b0:1c1:e380:b128 with SMTP id g4-20020a170902868400b001c1e380b128mr2666055plo.60.1694810192955; Fri, 15 Sep 2023 13:36:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694810192; cv=none; d=google.com; s=arc-20160816; b=IVPnqxhtjuBZnyWSuj7W8cOBhmMRuE/djIaY1MiWaTJCisx1Ih13Ua/p5L52ya1Zjo GykXrZqYexJedDsadkeaWtULO4tZ9GT4SS7hIKOfzIqsqaUgm3GePU78y2gEusjgkGgn vFIeZ1TBB2/VaaV1gyk/Z92jjokZLZRuK+1Qv8ez6BFkyHWlrrE4qWPCETct9wdTHvoY /WRqo5zSa+9fci3dKgO0KymOUNSwLqDa2SlHx/b4AledtAgtxchERUIuDD5LF/LH+3mz erk9+u4ubtqHSTYe/BI8cBpaPufbKwFVD5CAtJfT2oWPP/3IPyMcKFJZ+9fadcAekTdj 0g4w== 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=ruUqNqg+klzqg8DIZkV1fJ8TK4DrEnEOQmLelzItfAk=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=dQ5DLj2FESXFWaOic+q1aCekeblU7pvTZ+4n1C6TrkPQNeBhwR/mpeH1At85p8/oTF /lVGiKRcdJZYdRdUoBHape3UticmlYuk4GXfOXOM7JFVxANMNmI2CLMW9p1iKG2z4xrI bKNs7UEipn+yd2Qyz0kc6pWxVcZehf8J9WQOQzlDwSM7jmbL7db0er1NnHiqb386KJNI WAL1GI+s5l1t/tGbFQziXjP9Zs4pnItOeR4LSVX15Q365HyumF4VN0dVjiKYet7dmUO3 m68Ry25XoshPG6KX5wuqNq0xXbSJMdEFf7NBphieiRsvKEFe2n3uK1s9NQI4TL2dVV6L 85Uw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=KW5hnRua; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id q8-20020a170902dac800b001bf0cc53d1fsi4137656plx.343.2023.09.15.13.36.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 13:36:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=KW5hnRua; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 8455581489F4; Fri, 15 Sep 2023 09:11:12 -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 S236511AbjIOQKi (ORCPT + 30 others); Fri, 15 Sep 2023 12:10:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60246 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236444AbjIOQKT (ORCPT ); Fri, 15 Sep 2023 12:10:19 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6645B10FA for ; Fri, 15 Sep 2023 09:09:53 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-31ff6420f73so90051f8f.1 for ; Fri, 15 Sep 2023 09:09:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694794192; x=1695398992; 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=ruUqNqg+klzqg8DIZkV1fJ8TK4DrEnEOQmLelzItfAk=; b=KW5hnRuacPrq6/XnKXlUMjVhjE1P43aDF9JEnYVuHmkbhT5AtQily4pJjHLBq4esbn QGCHITyof1fIzpqUWN5xGxSvquRTezvZR5orNpWf3D8GaZbV6XKlFdc1MqiP+82GSpM8 h0LRH0XArJ30hYbI+mVB3tvEDA6Z92wUaFtl+r1mtW8NnUg7alnI2dBuMiTTjULHfgR2 uPsm5no3t8DO6Wcvh7iY7weH3dTIU7EBDhrCiY1S/WwTetmtQmRNpk9KZL31wSUfy2iG vG0eDba8Xb9kS0J48emWzT5ly718PtL8VOEqDFXgbZcLjQIrLbxsKyLQlZHSqeooh2aq V0jQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694794192; x=1695398992; 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=ruUqNqg+klzqg8DIZkV1fJ8TK4DrEnEOQmLelzItfAk=; b=X34CBO69dHijdqoXuufYphPIdPDq2M3IdHwOqeDuxic60ydaaQ/Pq5QohwkrkQ2lNs Q/FH+JwPKh4bpd4BFTs7vH99MtSXGy6aTJuAGlEpRJSxuR5IUFQJPYmlRdaQ/NB6aWmB yz2I4JPKoNafwGpJTvXx1Fr+m/G8k1bgDm76MvvVyIyMkiZ9JWg49ecLTdE7IS596jL/ cq9s7/gJYJklmP618rUP+95Jn5T0vUcnsumdDg40GfIIErntx4eVQLC9URURWTDJuVsa pxQ6j3C2qJ+CmzzR1YmxsSqEuJFitcS2nH2591+wy4nV6y9KEfBgyjLBtQ14id55kqOy 7GqA== X-Gm-Message-State: AOJu0Yzp7JQ9Og/8wYVVfX7eX3I2liYu4rLBIf33cdT93X5U0YIUfhXH ToxAQdnyrzuS4j64K901MCc= X-Received: by 2002:a05:6000:110b:b0:31f:af30:1bd4 with SMTP id z11-20020a056000110b00b0031faf301bd4mr1814580wrw.1.1694794191738; Fri, 15 Sep 2023 09:09:51 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id s10-20020a5d510a000000b0031971ab70c9sm4811105wrt.73.2023.09.15.09.09.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 09:09:51 -0700 (PDT) Date: Fri, 15 Sep 2023 18:09:50 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 15/16] staging: rtl8192e: Replace usage of RTLLIB_FCTL_DSTODS with function Message-ID: <69f72a352b8129bcc6610c1355a41d966abf24d8.1694792595.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]); Fri, 15 Sep 2023 09:11:12 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777137293202650117 X-GMAIL-MSGID: 1777137293202650117 Replace usage of RTLLIB_FCTL_DSTODS with function ieee80211_has_a4() to avoid proprietary code and to increase readability. To achieve this goal it was required to change a parameter of function rtllib_rx_data_filter(). Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtllib.h | 1 - drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 3 +-- drivers/staging/rtl8192e/rtllib_rx.c | 14 +++++++------- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index 47156eb8f46b..9179c3c14ab3 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -338,7 +338,6 @@ enum rt_op_mode { #define RTLLIB_FCTL_FRAMETYPE 0x00fc #define RTLLIB_FCTL_TODS 0x0100 #define RTLLIB_FCTL_FROMDS 0x0200 -#define RTLLIB_FCTL_DSTODS 0x0300 #define RTLLIB_FCTL_MOREFRAGS 0x0400 #define RTLLIB_FCTL_RETRY 0x0800 #define RTLLIB_FCTL_PM 0x1000 diff --git a/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c b/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c index 8e4514cc132c..5621261d66b9 100644 --- a/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c +++ b/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c @@ -92,8 +92,7 @@ static int ccmp_init_iv_and_aad(struct ieee80211_hdr *hdr, int a4_included, qc_included; fc = le16_to_cpu(hdr->frame_control); - a4_included = ((fc & (RTLLIB_FCTL_TODS | RTLLIB_FCTL_FROMDS)) == - (RTLLIB_FCTL_TODS | RTLLIB_FCTL_FROMDS)); + a4_included = ieee80211_has_a4(hdr->frame_control); qc_included = ((WLAN_FC_GET_TYPE(fc) == RTLLIB_FTYPE_DATA) && (WLAN_FC_GET_STYPE(fc) & 0x80)); diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c index 4d8c3869eb83..ef042dfd89cb 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -97,7 +97,7 @@ rtllib_frag_cache_get(struct rtllib_device *ieee, struct ieee80211_qos_hdr_4addr *hdr_4addrqos; u8 tid; - if (((fc & RTLLIB_FCTL_DSTODS) == RTLLIB_FCTL_DSTODS) && + if (ieee80211_has_a4(hdr->frame_control) && RTLLIB_QOS_HAS_SEQ(fc)) { hdr_4addrqos = (struct ieee80211_qos_hdr_4addr *)hdr; tid = le16_to_cpu(hdr_4addrqos->qos_ctrl) & RTLLIB_QCTL_TID; @@ -166,7 +166,7 @@ static int rtllib_frag_cache_invalidate(struct rtllib_device *ieee, struct ieee80211_qos_hdr_4addr *hdr_4addrqos; u8 tid; - if (((fc & RTLLIB_FCTL_DSTODS) == RTLLIB_FCTL_DSTODS) && + if (ieee80211_has_a4(hdr->frame_control) && RTLLIB_QOS_HAS_SEQ(fc)) { hdr_4addrqos = (struct ieee80211_qos_hdr_4addr *)hdr; tid = le16_to_cpu(hdr_4addrqos->qos_ctrl) & RTLLIB_QCTL_TID; @@ -359,7 +359,7 @@ static int is_duplicate_packet(struct rtllib_device *ieee, struct ieee80211_qos_hdr_4addr *hdr_4addrqos; u8 tid; - if (((fc & RTLLIB_FCTL_DSTODS) == RTLLIB_FCTL_DSTODS) && + if (ieee80211_has_a4(header->frame_control) && RTLLIB_QOS_HAS_SEQ(fc)) { hdr_4addrqos = (struct ieee80211_qos_hdr_4addr *)header; tid = le16_to_cpu(hdr_4addrqos->qos_ctrl) & RTLLIB_QCTL_TID; @@ -968,16 +968,16 @@ static void rtllib_rx_extract_addr(struct rtllib_device *ieee, } } -static int rtllib_rx_data_filter(struct rtllib_device *ieee, u16 fc, +static int rtllib_rx_data_filter(struct rtllib_device *ieee, struct ieee80211_hdr *hdr, u8 *dst, u8 *src, u8 *bssid, u8 *addr2) { u8 type, stype; - + u16 fc = le16_to_cpu(hdr->frame_control); type = WLAN_FC_GET_TYPE(fc); stype = WLAN_FC_GET_STYPE(fc); /* Filter frames from different BSS */ - if (((fc & RTLLIB_FCTL_DSTODS) != RTLLIB_FCTL_DSTODS) && + if (ieee80211_has_a4(hdr->frame_control) && !ether_addr_equal(ieee->current_network.bssid, bssid) && !is_zero_ether_addr(ieee->current_network.bssid)) { return -1; @@ -1341,7 +1341,7 @@ static int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb, rtllib_rx_extract_addr(ieee, hdr, dst, src, bssid); /* Filter Data frames */ - ret = rtllib_rx_data_filter(ieee, fc, dst, src, bssid, hdr->addr2); + ret = rtllib_rx_data_filter(ieee, hdr, dst, src, bssid, hdr->addr2); if (ret < 0) goto rx_dropped;