Received: by 2002:ab2:6a05:0:b0:1f8:1780:a4ed with SMTP id w5csp3098289lqo; Tue, 14 May 2024 22:17:02 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUv7KDoa6AfViCnnNr6lsLKaR2WjiREFLaoO6kYLLod3IJHgoUGpNS5u52QfKy3SlrPozPinkBIjKZre8rz/OKxahzmmGY7sVLw4msVrw== X-Google-Smtp-Source: AGHT+IFgLUJ9DDVg31iYL6EX29Ww1CnHyBBI4hB7AQjl5gGCEQlX8ij6PvSX6PTgp5Svz/TCz+se X-Received: by 2002:a05:620a:222b:b0:790:f696:2eb0 with SMTP id af79cd13be357-792c75ff83amr1505788685a.75.1715750222656; Tue, 14 May 2024 22:17:02 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715750222; cv=pass; d=google.com; s=arc-20160816; b=XimVP1rH/6tJLhTiJoRMrCTqgxU6UppgSEahWchcbZDEkwZotYiKAiQdKdqM01U9UJ /zW/gjX/D8J8DuY0LcUrx7OLeZ8t8Yu1+SSY/h8tO9ok4/4EFRo3itB1L8GZtG3kodhh lmL0mZ0taVc3MMLYTT3jwP70G3i6bFNRfEXP9eoRacj7aA7rau8L08dpSJeavoN8bJ2o PwzRyEbEtEBinrTvxkkmCZyR4DyntuIOWiFYr16MOGpTj1W5c3Gtm9y+wh+UWKEdpCUG 8ufCLuYSZdO5uJqxovEZ+bIdVRhIRONL0Pv7ZFTExRheI6ZOoWnKGiqncaf5drQcFGR9 +JRg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=P5tTRlvba6F46bSw0/iKQNOrZ3zzLqHwL6ZR5s0u92w=; fh=eMP7V/602C7P9cyTRwdQ+pe0CeXKn7NPtT//UNrM+lE=; b=jc4kVxucar4MvxZjSKZuflrE/lFAiZJ3OIZ8O/VAuoCY1QCvXZZAkT6F6fWuy5wi1b RQUFYgQvjwvRUwAUb0A5xHUg4Eor9sDUizaYrNuh0V4VnflcESoDNRI/WapI9xS3n8je GiWAndHy3RxpJ2rFsIaGg+Bq4lkligf9Qv4LC0SAyrCfnbj3rVX/WCBZue0a2Wb5svMK 9gbiN8T9m1avWinxI2VcdBh9W+WsQN0H88tSogQh27B099V+yrEXjjaBwVtNYXNXQIcx MY1b1KUeVilf38qudf9QJAU/11ndhDYBgoHpokDDY8PN7NrhRUTuvA0u5uHe8l/fwGqB 5ROg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@darkphysics.net header.s=google header.b=gFwJvBud; arc=pass (i=1 spf=pass spfdomain=darkphysics.net dkim=pass dkdomain=darkphysics.net); spf=pass (google.com: domain of linux-kernel+bounces-179434-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-179434-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id af79cd13be357-792bf306699si1035518785a.225.2024.05.14.22.17.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 May 2024 22:17:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-179434-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@darkphysics.net header.s=google header.b=gFwJvBud; arc=pass (i=1 spf=pass spfdomain=darkphysics.net dkim=pass dkdomain=darkphysics.net); spf=pass (google.com: domain of linux-kernel+bounces-179434-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-179434-linux.lists.archive=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 2C55A1C24394 for ; Wed, 15 May 2024 04:58:11 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 19B6B7580E; Wed, 15 May 2024 04:52:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=darkphysics.net header.i=@darkphysics.net header.b="gFwJvBud" Received: from mail-oi1-f182.google.com (mail-oi1-f182.google.com [209.85.167.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6672F6E617 for ; Wed, 15 May 2024 04:52:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715748778; cv=none; b=Y4a2RR8zWzGaAZBpZoWGX4cVnX+sJOOftcYFzNrAiu66t23Na4ztNxWYGxv4jBmWc6Kc2YLN5MuhRkFQoEn3NySGE00EboOGE+iw/KxnSToOgG5xHro7kba4tNFJsqaDYsBYDPsAM64gZrPnzBMe7rBdQWqCN7XNCUpLWFCf/C0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715748778; c=relaxed/simple; bh=x+7th958K+EtaVZNAuZ4f3J4B8F0FKqpXqhitiQlKQE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=blZrFaVCPvdmlXikmjCtyz7aHqI07deyOIx8FjKoF04zolyrKgok6ww2zPK+XgLPIDCC28W/1QGfTfJa9oETOaNOGXPYVBkKDEh+IOLNH65wUEPef+Xyk419LMrdHXBhSjC57HaQhlY65YvQub9d/9IayVcCThlylRae0A7aV0U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=darkphysics.net; spf=pass smtp.mailfrom=darkphysics.net; dkim=pass (2048-bit key) header.d=darkphysics.net header.i=@darkphysics.net header.b=gFwJvBud; arc=none smtp.client-ip=209.85.167.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=darkphysics.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=darkphysics.net Received: by mail-oi1-f182.google.com with SMTP id 5614622812f47-3c9995562a0so2831250b6e.2 for ; Tue, 14 May 2024 21:52:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=darkphysics.net; s=google; t=1715748775; x=1716353575; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=P5tTRlvba6F46bSw0/iKQNOrZ3zzLqHwL6ZR5s0u92w=; b=gFwJvBud17XRfgk+BLZeJA3VIx8iE6DD6FKK3LMNFHrodTKObiXPF19DKMHS5lOmPB qNs8+5gRYIThs3SoVepQ1WgAAzJSbreSHrqKZT+1ATfQYttbLqbXD8tAG7wNSX0Y88P2 PkOzlF6AZIrM7mxcWDEaUQCS6p93FdPHhdS2bR92KlHTTY3m0MaUemPPPFAVRCMvc5BP +Nb5t7CxVcTD/ddz3/KBDlNZm7xb0zueL4x/Q41G3svp939n0zjFuFhezvFftTLFzWyL h7a4Ds+ZYvg9BVJ7gIOHZZAAKtPkwSJ5myDKgjdYfwoZdTq8YOAvDCcLB8HOMerJikHg ctNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715748775; x=1716353575; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=P5tTRlvba6F46bSw0/iKQNOrZ3zzLqHwL6ZR5s0u92w=; b=ABsM7anJotny6u3VvQshKuX/3t5D+cnVz0vTRvY1ZS35qWA9KRpFLoJ5H6jroKJHdX Vys31hCMqhWJqbFkFaODbuzdfe6/7Bs786dVX9HnMNOTpCg20h24ZLbaaKEpnQl5EbKD JH4n0oZ5MwuDAIt4WQdQQwwdLAiIE2i+nH6wg0u22XgRBTmsaEr+bZEjq/SYg7seczTn Gophy7gVXbESH8KSG1xM4eT1rK5I1D2QLVuTMI41vE67PLMtuOgGXH5SOR+zrbPv+pxv GfDdhU9J4p+RWgVs2Hv2iwFNf6Yjp3CDKfSmIiSYzhty2PENQIbpQnafgxyiTWCcXGg8 8LBA== X-Forwarded-Encrypted: i=1; AJvYcCUd5qLcBxya50kTbOW4XA05Vi1nRihhXWWj4tja7BP6HSPGZMKKOOYLBRv42Fhdtvma4ljevfr/2IrdydPRfxcy4LHQ420FmoMMZ2tb X-Gm-Message-State: AOJu0Ywe2e+Dt5QxCdWRZ3NiCI4kwF1HfvPpbsV/n27SydUfC6Py5QTY kCqqgO1hk2qPvMxgkHXnzS/1w6v2aOBMMRciidhNqsqK5zHgfvk7lw/M4Bc1Oh0= X-Received: by 2002:aca:2806:0:b0:3c9:66f2:69c0 with SMTP id 5614622812f47-3c9971d9509mr14382791b6e.55.1715748774095; Tue, 14 May 2024 21:52:54 -0700 (PDT) Received: from lunchbox.darkphysics (c-76-146-178-2.hsd1.wa.comcast.net. [76.146.178.2]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f4d2a827fdsm10135035b3a.60.2024.05.14.21.52.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 May 2024 21:52:53 -0700 (PDT) From: Tree Davies To: gregkh@linuxfoundation.org, philipp.g.hortmann@gmail.com, anjan@momi.ca Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Tree Davies Subject: [PATCH 28/31] Staging: rtl8192e: Rename variable IsQoSDataFrame Date: Tue, 14 May 2024 21:52:25 -0700 Message-Id: <20240515045228.35928-29-tdavies@darkphysics.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20240515045228.35928-1-tdavies@darkphysics.net> References: <20240515045228.35928-1-tdavies@darkphysics.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Rename variable IsQoSDataFrame to is_qos_data_frame to fix checkpatch warning Avoid CamelCase. Signed-off-by: Tree Davies --- drivers/staging/rtl8192e/rtl819x_HTProc.c | 2 +- drivers/staging/rtl8192e/rtllib.h | 2 +- drivers/staging/rtl8192e/rtllib_rx.c | 2 +- drivers/staging/rtl8192e/rtllib_tx.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c index 9b0a981f6f22..36a734ded7dc 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -625,7 +625,7 @@ EXPORT_SYMBOL(HT_update_self_and_peer_setting); u8 ht_c_check(struct rtllib_device *ieee, u8 *pFrame) { if (ieee->ht_info->current_ht_support) { - if ((IsQoSDataFrame(pFrame) && frame_order(pFrame)) == 1) { + if ((is_qos_data_frame(pFrame) && frame_order(pFrame)) == 1) { netdev_dbg(ieee->dev, "HT CONTROL FILED EXIST!!\n"); return true; } diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index ca69bb0965ba..e2695beaf582 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -340,7 +340,7 @@ enum rt_op_mode { #define FC_QOS_BIT BIT(7) #define is_data_frame(pdu) (((pdu[0] & 0x0C) == 0x08) ? true : false) #define is_legacy_data_frame(pdu) (is_data_frame(pdu) && (!(pdu[0]&FC_QOS_BIT))) -#define IsQoSDataFrame(pframe) \ +#define is_qos_data_frame(pframe) \ ((*(u16 *)pframe&(IEEE80211_STYPE_QOS_DATA|RTLLIB_FTYPE_DATA)) == \ (IEEE80211_STYPE_QOS_DATA|RTLLIB_FTYPE_DATA)) #define frame_order(pframe) (*(u16 *)pframe&IEEE80211_FCTL_ORDER) diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c index fe72149aa81c..976e8b4da1d4 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -1322,7 +1322,7 @@ static int rtllib_rx_infra_adhoc(struct rtllib_device *ieee, struct sk_buff *skb /* Get TS for Rx Reorder */ hdr = (struct ieee80211_hdr *)skb->data; - if (ieee->current_network.qos_data.active && IsQoSDataFrame(skb->data) + if (ieee->current_network.qos_data.active && is_qos_data_frame(skb->data) && !is_multicast_ether_addr(hdr->addr1)) { TID = frame_qos_tid(skb->data); SeqNum = WLAN_GET_SEQ_SEQ(sc); diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192e/rtllib_tx.c index 1aeb207a3fee..b1bde5c0050a 100644 --- a/drivers/staging/rtl8192e/rtllib_tx.c +++ b/drivers/staging/rtl8192e/rtllib_tx.c @@ -275,7 +275,7 @@ static void rtllib_tx_query_agg_cap(struct rtllib_device *ieee, if (!ht_info->current_ht_support || !ht_info->enable_ht) return; - if (!IsQoSDataFrame(skb->data)) + if (!is_qos_data_frame(skb->data)) return; if (is_multicast_ether_addr(hdr->addr1)) return; @@ -472,7 +472,7 @@ static u16 rtllib_query_seqnum(struct rtllib_device *ieee, struct sk_buff *skb, if (is_multicast_ether_addr(dst)) return 0; - if (IsQoSDataFrame(skb->data)) { + if (is_qos_data_frame(skb->data)) { struct tx_ts_record *ts = NULL; if (!rtllib_get_ts(ieee, (struct ts_common_info **)(&ts), dst, -- 2.30.2