From nobody Mon Feb 9 18:01:24 2026 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 5537E17839E for ; Sun, 8 Sep 2024 19:26:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725823602; cv=none; b=BbP4dFmMhPe2HS2XKu4I+/eU6tT82n6OLH4GX2tkO9X9vjbKmU1AAO2dIIXfNdS7Ha0hhfmMa+Y2G/0+tfTghlNF1W9Oz7r+bRzbHY942mJTGoFtQBx8STJvQ3GzJjBo58Ag4vtSO6IoNrf8bwes2coe7wfiRXljlf2b9Di9ZEQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725823602; c=relaxed/simple; bh=nnxSeJG1du5Z643YEwdX5f5Vtc1/2IdyblEz7jkp4yc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Enps81W7Zpugs/HNVPo5O0rTrAoYG4/UIAW4VnYbSceBcU/HMfFafsT9mpCYaxpOmNsfLefnd0r9fBJ4WS3bVJhyKuw/BvlY2K/L0RSQdjLNx3pv/SMueFx1+GNMZvEEN5n40CzF7lnAHSPkoC0JYFuQYb+dvEBTIN4CWI5V9j8= 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=U1wshDkC; arc=none smtp.client-ip=209.85.214.178 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=darkphysics.net header.i=@darkphysics.net header.b="U1wshDkC" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-20543fdb7acso25379925ad.1 for ; Sun, 08 Sep 2024 12:26:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=darkphysics.net; s=google; t=1725823599; x=1726428399; 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=2KFmE8ZulfeBSFNzpno4ob0I7YnPxB69tGPDL4yyv3E=; b=U1wshDkC0oumaURVKLje5B6MSX7o5caWlKqeZ6XQKQleffGbl16oy1NHPMmiZAF1/I Ng2T6sWW6byw4P16AsUHP5ZO/mUw7Y0hIvG8Hc3XN6wU7VTgpJXLS0Q4LBRdRZsj92PL cF3U1QLAcO9zQbj7BHYaSQNP6wjO7QfDZZ8GRSl3jl/F62cm7CY/RudqF1OIyje78eM2 aC/3k9qox9SKEPzxo0OWSxK7gUIKTTwX09Zx5RLo2VT7KgyMFRpXWwKJ2YDqLBbaaPW9 DM5C80H4Fy0uQVmVIjPcNp1ClvsBN4335m1WPn1DXT2BOvd0NN2vsNhZj/mZeNPrrSsQ tfsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725823599; x=1726428399; 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=2KFmE8ZulfeBSFNzpno4ob0I7YnPxB69tGPDL4yyv3E=; b=w7MpClfdvUfzvdEn2yAvbG4bnTYn7KkBC2YnKXg99ywKfnqIEGE3KIjbsEHaiiK5Ci bySHszKJwmv/hgyq2sCZnU9/o6rijsFekSb8y6DBM2Z0jtxuKUNoqIiTeMTYpikbdNTe QBp9Yln1K588fc/drJwIpAQi7F2PbKhpclyXDgw+V7igcEsmI9sRedZmAW5ej0/myW2F o7bS945PI9n8K3aj7xjZY9tKPbzHnSwJQnYlO9Vjculkpo8/ldXsx+Qkbs3h7NnfUGDJ u1c20t9s3jQojgt1lJ6+nk5sQzV2nxmeJUbYWbtkQDuSICbSaxrAyrkTenOq9u5Svu6W 5jFg== X-Forwarded-Encrypted: i=1; AJvYcCWICgNMc9iP1VrYejvYtAZ9EijfTw4VixSbFoM3OKNY7uLagLzys0RU4yvY+89AhnZvsOMtBdSEb9TKOek=@vger.kernel.org X-Gm-Message-State: AOJu0YxJ9wRb1/JSHsrHJ3kiCgJmZ0Bvvw4mh15YWXH4BxBK70QKAcUZ h8DQPGLkWV/QTzAWIQGOrjdeGeM9CDcrzvD/JMkDR4ciqCdvyOO3ZEh2sBJjBnM= X-Google-Smtp-Source: AGHT+IFvS1aEBHwmx8e4GGbJhqwm4CP0mEI0CwkXQ6mMnwELs5iJUf/tFOkWbnuJ9pDWYSn3VV8rag== X-Received: by 2002:a17:902:dacc:b0:206:8c4a:7bbb with SMTP id d9443c01a7336-206f065bddbmr87077335ad.58.1725823598394; Sun, 08 Sep 2024 12:26:38 -0700 (PDT) Received: from lunchbox.darkphysics (c-73-83-183-190.hsd1.wa.comcast.net. [73.83.183.190]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20710e1b085sm22703305ad.36.2024.09.08.12.26.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Sep 2024 12:26:37 -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 02/16] Staging: rtl8192e: Rename variable SeqNum Date: Sun, 8 Sep 2024 12:26:19 -0700 Message-Id: <20240908192633.94144-3-tdavies@darkphysics.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20240908192633.94144-1-tdavies@darkphysics.net> References: <20240908192633.94144-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: quoted-printable Content-Type: text/plain; charset="utf-8" Rename variable SeqNum to seq_num to fix checkpatch warning Avoid CamelCase. Signed-off-by: Tree Davies --- drivers/staging/rtl8192e/rtl819x_TSProc.c | 16 ++--- drivers/staging/rtl8192e/rtllib.h | 2 +- drivers/staging/rtl8192e/rtllib_rx.c | 78 +++++++++++------------ 3 files changed, 48 insertions(+), 48 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rt= l8192e/rtl819x_TSProc.c index abdae7e36588..18b717a7409c 100644 --- a/drivers/staging/rtl8192e/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c @@ -27,22 +27,22 @@ static void RxPktPendingTimeout(struct timer_list *t) list_entry(ts->rx_pending_pkt_list.prev, struct rx_reorder_entry, list); if (index =3D=3D 0) - ts->rx_indicate_seq =3D reorder_entry->SeqNum; + ts->rx_indicate_seq =3D reorder_entry->seq_num; =20 - if (SN_LESS(reorder_entry->SeqNum, + if (SN_LESS(reorder_entry->seq_num, ts->rx_indicate_seq) || - SN_EQUAL(reorder_entry->SeqNum, + SN_EQUAL(reorder_entry->seq_num, ts->rx_indicate_seq)) { list_del_init(&reorder_entry->list); =20 - if (SN_EQUAL(reorder_entry->SeqNum, + if (SN_EQUAL(reorder_entry->seq_num, ts->rx_indicate_seq)) ts->rx_indicate_seq =3D (ts->rx_indicate_seq + 1) % 4096; =20 netdev_dbg(ieee->dev, - "%s(): Indicate SeqNum: %d\n", - __func__, reorder_entry->SeqNum); + "%s(): Indicate seq_num: %d\n", + __func__, reorder_entry->seq_num); ieee->stats_IndicateArray[index] =3D reorder_entry->prxb; index++; @@ -336,8 +336,8 @@ static void RemoveTsEntry(struct rtllib_device *ieee, pRxReorderEntry =3D (struct rx_reorder_entry *) list_entry(ts->rx_pending_pkt_list.prev, struct rx_reorder_entry, list); - netdev_dbg(ieee->dev, "%s(): Delete SeqNum %d!\n", - __func__, pRxReorderEntry->SeqNum); + netdev_dbg(ieee->dev, "%s(): Delete seq_num %d!\n", + __func__, pRxReorderEntry->seq_num); list_del_init(&pRxReorderEntry->list); { int i =3D 0; diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index 4762cb52261a..b033e8345b0a 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1015,7 +1015,7 @@ struct bandwidth_autoswitch { #define REORDER_ENTRY_NUM 128 struct rx_reorder_entry { struct list_head list; - u16 SeqNum; + u16 seq_num; struct rtllib_rxb *prxb; }; =20 diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192= e/rtllib_rx.c index cba4b244f808..86beac9dd3a5 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -408,13 +408,13 @@ static bool add_reorder_entry(struct rx_ts_record *ts, struct list_head *list =3D &ts->rx_pending_pkt_list; =20 while (list->next !=3D &ts->rx_pending_pkt_list) { - if (SN_LESS(reorder_entry->SeqNum, ((struct rx_reorder_entry *) + if (SN_LESS(reorder_entry->seq_num, ((struct rx_reorder_entry *) list_entry(list->next, struct rx_reorder_entry, - list))->SeqNum)) + list))->seq_num)) list =3D list->next; - else if (SN_EQUAL(reorder_entry->SeqNum, + else if (SN_EQUAL(reorder_entry->seq_num, ((struct rx_reorder_entry *)list_entry(list->next, - struct rx_reorder_entry, list))->SeqNum)) + struct rx_reorder_entry, list))->seq_num)) return false; else break; @@ -504,8 +504,8 @@ void rtllib_flush_rx_ts_pending_pkts(struct rtllib_devi= ce *ieee, pRxReorderEntry =3D (struct rx_reorder_entry *) list_entry(ts->rx_pending_pkt_list.prev, struct rx_reorder_entry, list); - netdev_dbg(ieee->dev, "%s(): Indicate SeqNum %d!\n", __func__, - pRxReorderEntry->SeqNum); + netdev_dbg(ieee->dev, "%s(): Indicate seq_num %d!\n", __func__, + pRxReorderEntry->seq_num); list_del_init(&pRxReorderEntry->list); =20 ieee->rfd_array[rfd_cnt] =3D pRxReorderEntry->prxb; @@ -521,7 +521,7 @@ void rtllib_flush_rx_ts_pending_pkts(struct rtllib_devi= ce *ieee, =20 static void rx_reorder_indicate_packet(struct rtllib_device *ieee, struct rtllib_rxb *prxb, - struct rx_ts_record *ts, u16 SeqNum) + struct rx_ts_record *ts, u16 seq_num) { struct rt_hi_throughput *ht_info =3D ieee->ht_info; struct rx_reorder_entry *reorder_entry =3D NULL; @@ -533,20 +533,20 @@ static void rx_reorder_indicate_packet(struct rtllib_= device *ieee, =20 netdev_dbg(ieee->dev, "%s(): Seq is %d, ts->rx_indicate_seq is %d, win_size is %d\n", - __func__, SeqNum, ts->rx_indicate_seq, win_size); + __func__, seq_num, ts->rx_indicate_seq, win_size); =20 spin_lock_irqsave(&(ieee->reorder_spinlock), flags); =20 win_end =3D (ts->rx_indicate_seq + win_size - 1) % 4096; /* Rx Reorder initialize condition.*/ if (ts->rx_indicate_seq =3D=3D 0xffff) - ts->rx_indicate_seq =3D SeqNum; + ts->rx_indicate_seq =3D seq_num; =20 - /* Drop out the packet which SeqNum is smaller than WinStart */ - if (SN_LESS(SeqNum, ts->rx_indicate_seq)) { + /* Drop out the packet which seq_num is smaller than WinStart */ + if (SN_LESS(seq_num, ts->rx_indicate_seq)) { netdev_dbg(ieee->dev, "Packet Drop! IndicateSeq: %d, NewSeq: %d\n", - ts->rx_indicate_seq, SeqNum); + ts->rx_indicate_seq, seq_num); ht_info->rx_reorder_drop_counter++; { int i; @@ -561,38 +561,38 @@ static void rx_reorder_indicate_packet(struct rtllib_= device *ieee, } =20 /* Sliding window manipulation. Conditions includes: - * 1. Incoming SeqNum is equal to WinStart =3D>Window shift 1 - * 2. Incoming SeqNum is larger than the win_end =3D> Window shift N + * 1. Incoming seq_num is equal to WinStart =3D>Window shift 1 + * 2. Incoming seq_num is larger than the win_end =3D> Window shift N */ - if (SN_EQUAL(SeqNum, ts->rx_indicate_seq)) { + if (SN_EQUAL(seq_num, ts->rx_indicate_seq)) { ts->rx_indicate_seq =3D (ts->rx_indicate_seq + 1) % 4096; match_win_start =3D true; - } else if (SN_LESS(win_end, SeqNum)) { - if (SeqNum >=3D (win_size - 1)) - ts->rx_indicate_seq =3D SeqNum + 1 - win_size; + } else if (SN_LESS(win_end, seq_num)) { + if (seq_num >=3D (win_size - 1)) + ts->rx_indicate_seq =3D seq_num + 1 - win_size; else ts->rx_indicate_seq =3D 4095 - - (win_size - (SeqNum + 1)) + 1; + (win_size - (seq_num + 1)) + 1; netdev_dbg(ieee->dev, "Window Shift! IndicateSeq: %d, NewSeq: %d\n", - ts->rx_indicate_seq, SeqNum); + ts->rx_indicate_seq, seq_num); } =20 /* Indication process. * After Packet dropping and Sliding Window shifting as above, we can - * now just indicate the packets with the SeqNum smaller than latest + * now just indicate the packets with the seq_num smaller than latest * WinStart and struct buffer other packets. * * For Rx Reorder condition: - * 1. All packets with SeqNum smaller than WinStart =3D> Indicate - * 2. All packets with SeqNum larger than or equal to + * 1. All packets with seq_num smaller than WinStart =3D> Indicate + * 2. All packets with seq_num larger than or equal to * WinStart =3D> Buffer it. */ if (match_win_start) { /* Current packet is going to be indicated.*/ netdev_dbg(ieee->dev, "Packets indication! IndicateSeq: %d, NewSeq: %d\n", - ts->rx_indicate_seq, SeqNum); + ts->rx_indicate_seq, seq_num); ieee->prxb_indicate_array[0] =3D prxb; index =3D 1; } else { @@ -606,7 +606,7 @@ static void rx_reorder_indicate_packet(struct rtllib_de= vice *ieee, /* Make a reorder entry and insert * into a the packet list. */ - reorder_entry->SeqNum =3D SeqNum; + reorder_entry->seq_num =3D seq_num; reorder_entry->prxb =3D prxb; =20 if (!add_reorder_entry(ts, reorder_entry)) { @@ -615,7 +615,7 @@ static void rx_reorder_indicate_packet(struct rtllib_de= vice *ieee, netdev_dbg(ieee->dev, "%s(): Duplicate packet is dropped. IndicateSeq: %d, NewSeq: %d\n", __func__, ts->rx_indicate_seq, - SeqNum); + seq_num); list_add_tail(&reorder_entry->list, &ieee->RxReorder_Unused_List); =20 @@ -626,7 +626,7 @@ static void rx_reorder_indicate_packet(struct rtllib_de= vice *ieee, } else { netdev_dbg(ieee->dev, "Pkt insert into struct buffer. IndicateSeq: %d, NewSeq: %d\n", - ts->rx_indicate_seq, SeqNum); + ts->rx_indicate_seq, seq_num); } } else { /* Packets are dropped if there are not enough reorder @@ -657,8 +657,8 @@ static void rx_reorder_indicate_packet(struct rtllib_de= vice *ieee, list_entry(ts->rx_pending_pkt_list.prev, struct rx_reorder_entry, list); - if (SN_LESS(reorder_entry->SeqNum, ts->rx_indicate_seq) || - SN_EQUAL(reorder_entry->SeqNum, ts->rx_indicate_seq)) { + if (SN_LESS(reorder_entry->seq_num, ts->rx_indicate_seq) || + SN_EQUAL(reorder_entry->seq_num, ts->rx_indicate_seq)) { /* This protect struct buffer from overflow. */ if (index >=3D REORDER_WIN_SIZE) { netdev_err(ieee->dev, @@ -670,13 +670,13 @@ static void rx_reorder_indicate_packet(struct rtllib_= device *ieee, =20 list_del_init(&reorder_entry->list); =20 - if (SN_EQUAL(reorder_entry->SeqNum, ts->rx_indicate_seq)) + if (SN_EQUAL(reorder_entry->seq_num, ts->rx_indicate_seq)) ts->rx_indicate_seq =3D (ts->rx_indicate_seq + 1) % 4096; =20 ieee->prxb_indicate_array[index] =3D reorder_entry->prxb; - netdev_dbg(ieee->dev, "%s(): Indicate SeqNum %d!\n", - __func__, reorder_entry->SeqNum); + netdev_dbg(ieee->dev, "%s(): Indicate seq_num %d!\n", + __func__, reorder_entry->seq_num); index++; =20 list_add_tail(&reorder_entry->list, @@ -731,10 +731,10 @@ static u8 parse_subframe(struct rtllib_device *ieee, = struct sk_buff *skb, bool is_aggregate_frame =3D false; u16 subframe_len; u8 pad_len =3D 0; - u16 SeqNum =3D 0; + u16 seq_num =3D 0; struct sk_buff *sub_skb; /* just for debug purpose */ - SeqNum =3D WLAN_GET_SEQ_SEQ(le16_to_cpu(hdr->seq_ctrl)); + seq_num =3D WLAN_GET_SEQ_SEQ(le16_to_cpu(hdr->seq_ctrl)); if ((RTLLIB_QOS_HAS_SEQ(fc)) && (((union frameqos *)(skb->data + RTLLIB_3ADDR_LEN))->field.reserved)) is_aggregate_frame =3D true; @@ -796,8 +796,8 @@ static u8 parse_subframe(struct rtllib_device *ieee, st= ruct sk_buff *skb, "nRemain_Length is %d and subframe_len is : %d\n", skb->len, subframe_len); netdev_info(ieee->dev, - "The Packet SeqNum is %d\n", - SeqNum); + "The Packet seq_num is %d\n", + seq_num); return 0; } =20 @@ -1227,7 +1227,7 @@ static int rtllib_rx_infra_adhoc(struct rtllib_device= *ieee, struct sk_buff *skb struct lib80211_crypt_data *crypt =3D NULL; struct rtllib_rxb *rxb =3D NULL; struct rx_ts_record *ts =3D NULL; - u16 fc, sc, SeqNum =3D 0; + u16 fc, sc, seq_num =3D 0; u8 type, stype, multicast =3D 0, unicast =3D 0, nr_subframes =3D 0, TID = =3D 0; u8 dst[ETH_ALEN]; u8 src[ETH_ALEN]; @@ -1321,7 +1321,7 @@ static int rtllib_rx_infra_adhoc(struct rtllib_device= *ieee, struct sk_buff *skb if (ieee->current_network.qos_data.active && is_qos_data_frame(skb->data) && !is_multicast_ether_addr(hdr->addr1)) { TID =3D frame_qos_tid(skb->data); - SeqNum =3D WLAN_GET_SEQ_SEQ(sc); + seq_num =3D WLAN_GET_SEQ_SEQ(sc); rtllib_get_ts(ieee, (struct ts_common_info **)&ts, hdr->addr2, TID, RX_DIR, true); if (TID !=3D 0 && TID !=3D 3) @@ -1362,7 +1362,7 @@ static int rtllib_rx_infra_adhoc(struct rtllib_device= *ieee, struct sk_buff *skb if (!ieee->ht_info->cur_rx_reorder_enable || !ts) rtllib_rx_indicate_pkt_legacy(ieee, rx_stats, rxb, dst, src); else - rx_reorder_indicate_packet(ieee, rxb, ts, SeqNum); + rx_reorder_indicate_packet(ieee, rxb, ts, seq_num); =20 dev_kfree_skb(skb); =20 --=20 2.30.2