From patchwork Mon Feb 26 03:56:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tree Davies X-Patchwork-Id: 206261 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp1870951dyb; Sun, 25 Feb 2024 20:55:17 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVQKyIAoIN9+zW1XAexVfN9NgEsf5WngmH12D6tYLZNZyaCxIzDe98PJS212KQd2G3TDrCLEl9/G9Mv+MkA7yvTrfEMmA== X-Google-Smtp-Source: AGHT+IEY1ennhBbjD+ZvE219EdETWUlo/IKInGvXAHUzWPnRtbAGCltXJ/UEkY+48ygYG0lXxKMd X-Received: by 2002:a05:6871:610c:b0:21f:c88e:d52f with SMTP id ra12-20020a056871610c00b0021fc88ed52fmr6990159oab.42.1708923317209; Sun, 25 Feb 2024 20:55:17 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708923317; cv=pass; d=google.com; s=arc-20160816; b=Wxw2/TwyTIhlR/RrGMDdF4X2ReRPCOf9SoBmwYMF6EQnblazP6hYR4RRw5/QTXC4OP xEcmCbKVD0VVk5vCyPyRaoYl6Phx/5k8LksiUxjjSAJPz7JYIq27GMtWhYBTCKBBma+L zlQSrrUhzu8eTBgxMBOgzFPeHOsxoM8yAOihUxPLZNW+w8zog9bW0pr3KHEsODaePQRq wfauVDOif1yPsUZpZaIMotQUO2Q/w4x6JqA8PATzRu8uPVjwgCOLIuGClvab2JqP+1iI nyEmGypRcGi329Qwg7R3FjAl7XPsi8GKjHLkOwP/I/+FLFiO1pw/jsaqBxHtz/O17Q9T Jeyg== 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=ZdNqV5+ffAhQgtPZjajCidDLujgoFt5XmWAm32Jyabw=; fh=Y2yPBTUkSo+PPktr9DplGE4hZxLH57NFwLp3jyXqs/s=; b=JbEzXYwZ7ojvkYuJ7ZnSdcYY7PDN6nansWJOxF7txkmDSUHQ6Hukx2W7WEGIZIshSj 1HpnBP4bFxCAZr7V8pwqa2mD59J0Cnf1vbXkQZV40AL5e2h+zL5LZLwGcF/vD+X8VQpd zfUY6VREakHbKGnjcXyAiABL0jKGGxU8km9/87U+zTc6qi3HN07F+tqtxdL9606EKLyM SHzymCysNPIBs7LlT9yRgjIw1AZJc980S9us6tHL92R6DfQN+cj1BQPavr12PGcxK3S2 sFSOLqWiQoQDMDxXvLLWyeCXNkA1j9Q5mAGrmLPCKZtFGp9syOnBUua8vC6tLBJDeSe1 8SUQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@darkphysics.net header.s=google header.b=lnJKjICt; arc=pass (i=1 spf=pass spfdomain=darkphysics.net dkim=pass dkdomain=darkphysics.net); spf=pass (google.com: domain of linux-kernel+bounces-80494-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80494-ouuuleilei=gmail.com@vger.kernel.org" Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id q5-20020a634305000000b005cdffc2828esi3087213pga.182.2024.02.25.20.55.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Feb 2024 20:55:17 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-80494-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@darkphysics.net header.s=google header.b=lnJKjICt; arc=pass (i=1 spf=pass spfdomain=darkphysics.net dkim=pass dkdomain=darkphysics.net); spf=pass (google.com: domain of linux-kernel+bounces-80494-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80494-ouuuleilei=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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 0026E282EB1 for ; Mon, 26 Feb 2024 04:00:17 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3562B200DB; Mon, 26 Feb 2024 03:56:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=darkphysics.net header.i=@darkphysics.net header.b="lnJKjICt" Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (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 27CE31CD16 for ; Mon, 26 Feb 2024 03:56:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708919800; cv=none; b=cKR1bP+D72N4hn4Iyql3iomCaJ0CYiZfDNrebRTm8Zu1O1HHpVR28YP+ST91ZlP6VLgG6O5TcYCZGp4rejCv5mUXYobILoKwNeloquv8N5Jr+4HHLbuyYguCvwxTBl3WQUcZjG9IhX+MYNwQyv22BAY2q/XPllCiDqU0OUSuSxU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708919800; c=relaxed/simple; bh=g3nFukFgoqAJK6s/qvYcL8fgv2CgGDB14Qsca/pPKFw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=cq6/5s03nBaQuevq8mC9KexFfd8d+JR0Sngpr9CMXRD0jj5QYoYe6YP9z1Y6QmYGLlNpjMwW3mtbwg37AFyaTEr12QLrBD3m15XZnXQZ9jljm19+TT3vwg9XCRrDcoWB5MXlgYP1X5OxlFmA2XR+xkcpiV2rKTwy8J+91cLjIk0= 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=lnJKjICt; arc=none smtp.client-ip=209.85.214.180 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-pl1-f180.google.com with SMTP id d9443c01a7336-1dcab44747bso662205ad.1 for ; Sun, 25 Feb 2024 19:56:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=darkphysics.net; s=google; t=1708919798; x=1709524598; 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=ZdNqV5+ffAhQgtPZjajCidDLujgoFt5XmWAm32Jyabw=; b=lnJKjICtKrSdhYLn0g7lgRFBnrQi/RM9eQDTZp6k3osyM/nI6AC1KBzoDbsO8oTWNy hYIOP41oeTlDP24MGN8+hTVWoWcrdAQQQJMmDbMPAd0eeHwcbSHl6TBODE1n8Y1YzkTc fiRw+atOsgX4mpnnUViwTPCy2WMr/lecHVxYZRXjL345xSMrp52v7jgRKczUrNNPhXdc YvWSW7sa+SuAsJMqxVCEJg38pV86fEAqCdwWQPB0zbSGqFu4uQH019xoel57ngn4zxHm dNawZ5w3nRBO0i6Tzbb+5VBXH2A7upkQrRsrJhke0EgdAal5hKLDFtkEGDWolZ2I7qzA fyGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708919798; x=1709524598; 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=ZdNqV5+ffAhQgtPZjajCidDLujgoFt5XmWAm32Jyabw=; b=H+i0cvOaXK7rweWLnOLvuZicg1Ml2JWPz6ne1473vpHsdC5zTMX5Bp23QR0knWtWp4 QkYynqWRkQLoydvWGTMh1OvFqV+Kf8xnpO3s7xuOIiA2D6NmlPxfRNg7gzbziZ+C3jsh zNFPJxu6zRTVHORAIUpgk6Ndj3QYa4DIyFSmLTqk/hgmETux9KnUHM6ISnUQ1q8NXWQz anAGVWyvl1RxozaBNn9sudXfp6CgPm4ZqNOBT0k4b9PtAcQaM0iFYBIbu+THFvf7Eojv zpzOk5Bj7as864s/N1RtIaBOINChkmh4qu+NWarASE3pcWZALnd19GWPn3Q0WWFpeXc6 z4Sw== X-Forwarded-Encrypted: i=1; AJvYcCXo+O6dKJLBtRbHl6oZexYZum6gHon3y1cj8Rf8ZFxt1U30EB3Z5WdO+/Z1qvL59wxZgPV0GTvG7nn0pY0Q97K6g+0WyXcUvNcqGHgG X-Gm-Message-State: AOJu0YzIsj0mMErhtWQoYJxCExudQbUt9lNq+HuMNeITu4Xm+ufWgmoI xsUVaSACew92JgoV60U8D51zEUWGLZYk6HM+VTja+aTApesYxeubHNfw26s2DDA= X-Received: by 2002:a17:902:f78c:b0:1dc:1379:2152 with SMTP id q12-20020a170902f78c00b001dc13792152mr6730839pln.56.1708919798503; Sun, 25 Feb 2024 19:56:38 -0800 (PST) Received: from oatmeal.darkphysics (c-76-146-178-2.hsd1.wa.comcast.net. [76.146.178.2]) by smtp.gmail.com with ESMTPSA id kh5-20020a170903064500b001d8a93fa5b1sm2897615plb.131.2024.02.25.19.56.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Feb 2024 19:56:38 -0800 (PST) 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 12/20] Staging: rtl8192e: Rename variable asRsn Date: Sun, 25 Feb 2024 19:56:16 -0800 Message-Id: <20240226035624.370443-13-tdavies@darkphysics.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240226035624.370443-1-tdavies@darkphysics.net> References: <20240226035624.370443-1-tdavies@darkphysics.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791935976229684766 X-GMAIL-MSGID: 1791935976229684766 Rename variable asRsn to rsn to fix checkpatch warning Avoid CamelCase, and adjust spacing to avoid alignment check. Signed-off-by: Tree Davies --- drivers/staging/rtl8192e/rtllib.h | 4 ++-- drivers/staging/rtl8192e/rtllib_softmac.c | 24 +++++++++++------------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index c703e6d95fb9..a5925fe75a6a 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1662,7 +1662,7 @@ int rtllib_rx_frame_softmac(struct rtllib_device *ieee, struct sk_buff *skb, void rtllib_softmac_new_net(struct rtllib_device *ieee, struct rtllib_network *net); -void send_disassociation(struct rtllib_device *ieee, bool deauth, u16 asRsn); +void send_disassociation(struct rtllib_device *ieee, bool deauth, u16 rsn); void rtllib_softmac_xmit(struct rtllib_txb *txb, struct rtllib_device *ieee); int rtllib_softmac_init(struct rtllib_device *ieee); @@ -1805,7 +1805,7 @@ static inline const char *escape_essid(const char *essid, u8 essid_len) } /* fun with the built-in rtllib stack... */ -bool rtllib_mgnt_disconnect(struct rtllib_device *rtllib, u8 asRsn); +bool rtllib_mgnt_disconnect(struct rtllib_device *rtllib, u8 rsn); /* For the function is more related to hardware setting, it's better to use the * ieee handler to refer to it. diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c index 4ab4cf6e1197..e59cd2792389 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -2144,7 +2144,7 @@ void rtllib_softmac_free(struct rtllib_device *ieee) static inline struct sk_buff * rtllib_disauth_skb(struct rtllib_network *beacon, - struct rtllib_device *ieee, u16 asRsn) + struct rtllib_device *ieee, u16 rsn) { struct sk_buff *skb; struct rtllib_disauth *disauth; @@ -2164,13 +2164,13 @@ rtllib_disauth_skb(struct rtllib_network *beacon, ether_addr_copy(disauth->header.addr2, ieee->dev->dev_addr); ether_addr_copy(disauth->header.addr3, beacon->bssid); - disauth->reason = cpu_to_le16(asRsn); + disauth->reason = cpu_to_le16(rsn); return skb; } static inline struct sk_buff * rtllib_disassociate_skb(struct rtllib_network *beacon, - struct rtllib_device *ieee, u16 asRsn) + struct rtllib_device *ieee, u16 rsn) { struct sk_buff *skb; struct rtllib_disassoc *disass; @@ -2191,19 +2191,19 @@ rtllib_disassociate_skb(struct rtllib_network *beacon, ether_addr_copy(disass->header.addr2, ieee->dev->dev_addr); ether_addr_copy(disass->header.addr3, beacon->bssid); - disass->reason = cpu_to_le16(asRsn); + disass->reason = cpu_to_le16(rsn); return skb; } -void send_disassociation(struct rtllib_device *ieee, bool deauth, u16 asRsn) +void send_disassociation(struct rtllib_device *ieee, bool deauth, u16 rsn) { struct rtllib_network *beacon = &ieee->current_network; struct sk_buff *skb; if (deauth) - skb = rtllib_disauth_skb(beacon, ieee, asRsn); + skb = rtllib_disauth_skb(beacon, ieee, rsn); else - skb = rtllib_disassociate_skb(beacon, ieee, asRsn); + skb = rtllib_disassociate_skb(beacon, ieee, rsn); if (skb) softmac_mgmt_xmit(skb, ieee); @@ -2238,7 +2238,7 @@ u8 rtllib_ap_sec_type(struct rtllib_device *ieee) } static void rtllib_mlme_disassociate_request(struct rtllib_device *rtllib, - u8 *asSta, u8 asRsn) + u8 *asSta, u8 rsn) { u8 i; u8 op_mode; @@ -2261,7 +2261,7 @@ static void rtllib_mlme_disassociate_request(struct rtllib_device *rtllib, } } -static void rtllib_mgnt_disconnect_ap(struct rtllib_device *rtllib, u8 asRsn) +static void rtllib_mgnt_disconnect_ap(struct rtllib_device *rtllib, u8 rsn) { bool filter_out_nonassociated_bssid = false; @@ -2269,19 +2269,19 @@ static void rtllib_mgnt_disconnect_ap(struct rtllib_device *rtllib, u8 asRsn) rtllib->set_hw_reg_handler(rtllib->dev, HW_VAR_CECHK_BSSID, (u8 *)(&filter_out_nonassociated_bssid)); rtllib_mlme_disassociate_request(rtllib, rtllib->current_network.bssid, - asRsn); + rsn); rtllib->link_state = MAC80211_NOLINK; } -bool rtllib_mgnt_disconnect(struct rtllib_device *rtllib, u8 asRsn) +bool rtllib_mgnt_disconnect(struct rtllib_device *rtllib, u8 rsn) { if (rtllib->ps != RTLLIB_PS_DISABLED) rtllib->sta_wake_up(rtllib->dev); if (rtllib->link_state == MAC80211_LINKED) { if (rtllib->iw_mode == IW_MODE_INFRA) - rtllib_mgnt_disconnect_ap(rtllib, asRsn); + rtllib_mgnt_disconnect_ap(rtllib, rsn); } return true;