Commit 55bce0ae authored by Philipp Hortmann's avatar Philipp Hortmann Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Rename szRT2RTAggBuffer, bRegRxRe... and bCurRxReo... 



Rename variable szRT2RTAggBuffer to sz_rt2rt_agg_buf, bRegRxReorderEnable
to reg_rx_reorder_enable and bCurRxReorderEnable to cur_rx_reorder_enable
to avoid CamelCase which is not accepted by checkpatch.

Signed-off-by: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/af445e0a80dc8e153a1ba81df99309f19a69d6cb.1664055213.git.philipp.g.hortmann@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 27dd3f00

drivers/staging/rtl8192e/rtl819x_HT.h

+3 −3
Original line number Diff line number Diff line
@@ -158,10 +158,10 @@ struct rt_hi_throughput { 
	u8				RT2RT_HT_Mode;

	u8 current_rt2rt_aggregation;

	u8 current_rt2rt_long_slot_time;

	u8				szRT2RTAggBuffer[10];

	u8 sz_rt2rt_agg_buf[10];



	u8				bRegRxReorderEnable;

	u8				bCurRxReorderEnable;

	u8 reg_rx_reorder_enable;

	u8 cur_rx_reorder_enable;

	u8				RxReorderWinSize;

	u8				RxReorderPendingTime;

	u16				RxReorderDropCounter;

drivers/staging/rtl8192e/rtl819x_HTProc.c

+2 −2
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ void HTUpdateDefaultSetting(struct rtllib_device *ieee) 


	pHTInfo->reg_rt2rt_aggregation = 1;



	pHTInfo->bRegRxReorderEnable = 1;

	pHTInfo->reg_rx_reorder_enable = 1;

	pHTInfo->RxReorderWinSize = 64;

	pHTInfo->RxReorderPendingTime = 30;

}
@@ -605,7 +605,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee) 
		pHTInfo->ForcedAMSDUMode = HT_AGG_FORCE_ENABLE;

		pHTInfo->ForcedAMSDUMaxSize = 7935;

	}

	pHTInfo->bCurRxReorderEnable = pHTInfo->bRegRxReorderEnable;

	pHTInfo->cur_rx_reorder_enable = pHTInfo->reg_rx_reorder_enable;



	if (pPeerHTCap->MCS[0] == 0)

		pPeerHTCap->MCS[0] = 0xff;

drivers/staging/rtl8192e/rtllib_rx.c

+2 −2
Original line number Diff line number Diff line
@@ -924,7 +924,7 @@ static int rtllib_rx_check_duplicate(struct rtllib_device *ieee, 
	sc = le16_to_cpu(hdr->seq_ctl);

	frag = WLAN_GET_SEQ_FRAG(sc);



	if (!ieee->pHTInfo->bCurRxReorderEnable ||

	if (!ieee->pHTInfo->cur_rx_reorder_enable ||

		!ieee->current_network.qos_data.active ||

		!IsDataFrame(skb->data) ||

		IsLegacyDataFrame(skb->data)) {
@@ -1442,7 +1442,7 @@ static int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb, 
	}



	/* Indicate packets to upper layer or Rx Reorder */

	if (!ieee->pHTInfo->bCurRxReorderEnable || pTS == NULL || bToOtherSTA)

	if (!ieee->pHTInfo->cur_rx_reorder_enable || pTS == NULL || bToOtherSTA)

		rtllib_rx_indicate_pkt_legacy(ieee, rx_stats, rxb, dst, src);

	else

		RxReorderIndicatePacket(ieee, rxb, pTS, SeqNum);

drivers/staging/rtl8192e/rtllib_softmac.c

+4 −4
Original line number Diff line number Diff line
@@ -866,9 +866,9 @@ static struct sk_buff *rtllib_probe_resp(struct rtllib_device *ieee, 
				       encrypt);



		if (pHTInfo->reg_rt2rt_aggregation) {

			tmp_generic_ie_buf = ieee->pHTInfo->szRT2RTAggBuffer;

			tmp_generic_ie_buf = ieee->pHTInfo->sz_rt2rt_agg_buf;

			tmp_generic_ie_len =

				 sizeof(ieee->pHTInfo->szRT2RTAggBuffer);

				 sizeof(ieee->pHTInfo->sz_rt2rt_agg_buf);

			HTConstructRT2RTAggElement(ieee, tmp_generic_ie_buf,

						   &tmp_generic_ie_len);

		}
@@ -1190,9 +1190,9 @@ rtllib_association_req(struct rtllib_network *beacon, 
		HTConstructCapabilityElement(ieee, ht_cap_buf, &ht_cap_len,

					     encrypt, true);

		if (ieee->pHTInfo->current_rt2rt_aggregation) {

			realtek_ie_buf = ieee->pHTInfo->szRT2RTAggBuffer;

			realtek_ie_buf = ieee->pHTInfo->sz_rt2rt_agg_buf;

			realtek_ie_len =

				 sizeof(ieee->pHTInfo->szRT2RTAggBuffer);

				 sizeof(ieee->pHTInfo->sz_rt2rt_agg_buf);

			HTConstructRT2RTAggElement(ieee, realtek_ie_buf,

						   &realtek_ie_len);

		}