Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 304536
b: refs/heads/master
c: 4c234eb
h: refs/heads/master
v: v3
  • Loading branch information
Justin P. Mattock authored and Greg Kroah-Hartman committed May 2, 2012
1 parent a3fc5e4 commit 121db9d
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8ef3a7ed35a09431336faf2f3ce53d4d0959cea1
refs/heads/master: 4c234ebcf4c98b20b8e3fa121b2382c375c3aa57
2 changes: 1 addition & 1 deletion trunk/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
20 changes: 10 additions & 10 deletions trunk/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
}

Expand All @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/rtl8192u/r8192U.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
20 changes: 10 additions & 10 deletions trunk/drivers/staging/rtl8192u/r8192U_dm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}

Expand Down Expand Up @@ -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
Expand All @@ -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;

Expand Down

0 comments on commit 121db9d

Please sign in to comment.