Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c234ebc authored by Justin P. Mattock's avatar Justin P. Mattock Committed by Greg Kroah-Hartman
Browse files

staging: "rtl8192e/r8192u" typo change ContiuneDiffCount. 



As mentioned by jesper juhl, we should probably change ContiuneDiffCount
to ContinueDiffCount. Below you will find the changes to do so.  I have
compile tested this and everything builds with the changes, as for
testing on the hardware I am unable to do.

Signed-off-by: default avatarJustin P. Mattock <justinmattock@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8ef3a7ed

drivers/staging/rtl8192e/rtl8192e/rtl_core.h

+1 −1
Original line number Diff line number Diff line
@@ -943,7 +943,7 @@ struct r8192_priv { 
	bool		bfsync_processing;

	u32		rate_record;

	u32		rateCountDiffRecord;

	u32		ContiuneDiffCount;

	u32		ContinueDiffCount;

	bool		bswitch_fsync;

	u8		framesync;

	u32		framesyncC34;

drivers/staging/rtl8192e/rtl8192e/rtl_dm.c

+10 −10
Original line number Diff line number Diff line
@@ -2615,22 +2615,22 @@ void dm_fsync_timer_callback(unsigned long data) 
				      rate_count_diff;

			if (DiffNum >=

			    priv->rtllib->fsync_seconddiff_ratethreshold)

				priv->ContiuneDiffCount++;

				priv->ContinueDiffCount++;

			else

				priv->ContiuneDiffCount = 0;

				priv->ContinueDiffCount = 0;



			if (priv->ContiuneDiffCount >= 2) {

			if (priv->ContinueDiffCount >= 2) {

				bSwitchFromCountDiff = true;

				priv->ContiuneDiffCount = 0;

				priv->ContinueDiffCount = 0;

			}

		} else {

			priv->ContiuneDiffCount = 0;

			priv->ContinueDiffCount = 0;

		}



		if (rate_count_diff <=

		    priv->rtllib->fsync_firstdiff_ratethreshold) {

			bSwitchFromCountDiff = true;

			priv->ContiuneDiffCount = 0;

			priv->ContinueDiffCount = 0;

		}

		priv->rate_record = rate_count;

		priv->rateCountDiffRecord = rate_count_diff;
@@ -2677,10 +2677,10 @@ void dm_fsync_timer_callback(unsigned long data) 
			write_nic_byte(dev, 0xC36, 0x5c);

			write_nic_byte(dev, 0xC3e, 0x96);

		}

		priv->ContiuneDiffCount = 0;

		priv->ContinueDiffCount = 0;

		write_nic_dword(dev, rOFDM0_RxDetector2, 0x465c52cd);

	}

	RT_TRACE(COMP_HALDM, "ContiuneDiffCount %d\n", priv->ContiuneDiffCount);

	RT_TRACE(COMP_HALDM, "ContinueDiffCount %d\n", priv->ContinueDiffCount);

	RT_TRACE(COMP_HALDM, "rateRecord %d rateCount %d, rateCountdiff %d "

		 "bSwitchFsync %d\n", priv->rate_record, rate_count,

		 rate_count_diff, priv->bswitch_fsync);
@@ -2723,7 +2723,7 @@ static void dm_EndSWFsync(struct net_device *dev) 
		write_nic_byte(dev, 0xC3e, 0x96);

	}



	priv->ContiuneDiffCount = 0;

	priv->ContinueDiffCount = 0;

	write_nic_dword(dev, rOFDM0_RxDetector2, 0x465c52cd);

}
@@ -2735,7 +2735,7 @@ static void dm_StartSWFsync(struct net_device *dev) 


	RT_TRACE(COMP_HALDM, "%s\n", __func__);

	priv->rate_record = 0;

	priv->ContiuneDiffCount = 0;

	priv->ContinueDiffCount = 0;

	priv->rateCountDiffRecord = 0;

	priv->bswitch_fsync  = false;

drivers/staging/rtl8192u/r8192U.h

+1 −1
Original line number Diff line number Diff line
@@ -1116,7 +1116,7 @@ typedef struct r8192_priv 
	bool bfsync_processing;	// 500ms Fsync timer is active or not

	u32 	rate_record;

	u32 	rateCountDiffRecord;

	u32	ContiuneDiffCount;

	u32	ContinueDiffCount;

	bool bswitch_fsync;



	u8	framesync;

drivers/staging/rtl8192u/r8192U_dm.c

+10 −10
Original line number Diff line number Diff line
@@ -3379,28 +3379,28 @@ extern void dm_fsync_timer_callback(unsigned long data) 
			u32 DiffNum = priv->rateCountDiffRecord - rate_count_diff;

			// Continue count

			if(DiffNum >= priv->ieee80211->fsync_seconddiff_ratethreshold)

				priv->ContiuneDiffCount++;

				priv->ContinueDiffCount++;

			else

				priv->ContiuneDiffCount = 0;

				priv->ContinueDiffCount = 0;



			// Continue count over

			if(priv->ContiuneDiffCount >=2)

			if(priv->ContinueDiffCount >=2)

			{

				bSwitchFromCountDiff = true;

				priv->ContiuneDiffCount = 0;

				priv->ContinueDiffCount = 0;

			}

		}

		else

		{

			// Stop the continued count

			priv->ContiuneDiffCount = 0;

			priv->ContinueDiffCount = 0;

		}



		//If Count diff <= FsyncRateCountThreshold

		if(rate_count_diff <= priv->ieee80211->fsync_firstdiff_ratethreshold)

		{

			bSwitchFromCountDiff = true;

			priv->ContiuneDiffCount = 0;

			priv->ContinueDiffCount = 0;

		}

		priv->rate_record = rate_count;

		priv->rateCountDiffRecord = rate_count_diff;
@@ -3468,14 +3468,14 @@ extern void dm_fsync_timer_callback(unsigned long data) 
		#endif

			write_nic_byte(dev, 0xC3e, 0x96);

		}

		priv->ContiuneDiffCount = 0;

		priv->ContinueDiffCount = 0;

	#ifdef RTL8190P

		write_nic_dword(dev, rOFDM0_RxDetector2, 0x164052cd);

	#else

		write_nic_dword(dev, rOFDM0_RxDetector2, 0x465c52cd);

	#endif

	}

	RT_TRACE(COMP_HALDM, "ContiuneDiffCount %d\n", priv->ContiuneDiffCount);

	RT_TRACE(COMP_HALDM, "ContinueDiffCount %d\n", priv->ContinueDiffCount);

	RT_TRACE(COMP_HALDM, "rateRecord %d rateCount %d, rateCountdiff %d bSwitchFsync %d\n", priv->rate_record, rate_count, rate_count_diff , priv->bswitch_fsync);

}
@@ -3507,7 +3507,7 @@ static void dm_EndSWFsync(struct net_device *dev) 
		write_nic_byte(dev, 0xC3e, 0x96);

	}



	priv->ContiuneDiffCount = 0;

	priv->ContinueDiffCount = 0;

#ifndef RTL8190P

	write_nic_dword(dev, rOFDM0_RxDetector2, 0x465c52cd);

#endif
@@ -3524,7 +3524,7 @@ static void dm_StartSWFsync(struct net_device *dev) 
	// Initial rate record to zero, start to record.

	priv->rate_record = 0;

	// Initialize continue diff count to zero, start to record.

	priv->ContiuneDiffCount = 0;

	priv->ContinueDiffCount = 0;

	priv->rateCountDiffRecord = 0;

	priv->bswitch_fsync  = false;