diff options
author | Larry Finger <Larry.Finger@lwfinger.net> | 2012-08-31 16:38:59 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-09-07 15:05:57 -0400 |
commit | 229bd9df49cf772b0540ea13d64e8ca1bfcc6b48 (patch) | |
tree | fa5a933fcdbaf1906687f45d0cc8f11c2daac97f /drivers/net/wireless/rtlwifi | |
parent | 908fe11314be4744fb303179a1c46b22dcdc5b87 (diff) |
rtlwifi: rtl8192c: rtl8192de: Fix typo in cursta_connectctate
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rtlwifi')
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 30 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192de/dm.c | 10 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/wifi.h | 2 |
3 files changed, 21 insertions, 21 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c index a45afda8259c..2fd3b4950404 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c +++ b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | |||
@@ -167,7 +167,7 @@ static void rtl92c_dm_diginit(struct ieee80211_hw *hw) | |||
167 | dm_digtable->dig_ext_port_stage = DIG_EXT_PORT_STAGE_MAX; | 167 | dm_digtable->dig_ext_port_stage = DIG_EXT_PORT_STAGE_MAX; |
168 | dm_digtable->cur_igvalue = 0x20; | 168 | dm_digtable->cur_igvalue = 0x20; |
169 | dm_digtable->pre_igvalue = 0x0; | 169 | dm_digtable->pre_igvalue = 0x0; |
170 | dm_digtable->cursta_connectctate = DIG_STA_DISCONNECT; | 170 | dm_digtable->cursta_connectstate = DIG_STA_DISCONNECT; |
171 | dm_digtable->presta_connectstate = DIG_STA_DISCONNECT; | 171 | dm_digtable->presta_connectstate = DIG_STA_DISCONNECT; |
172 | dm_digtable->curmultista_connectstate = DIG_MULTISTA_DISCONNECT; | 172 | dm_digtable->curmultista_connectstate = DIG_MULTISTA_DISCONNECT; |
173 | dm_digtable->rssi_lowthresh = DM_DIG_THRESH_LOW; | 173 | dm_digtable->rssi_lowthresh = DM_DIG_THRESH_LOW; |
@@ -190,7 +190,7 @@ static u8 rtl92c_dm_initial_gain_min_pwdb(struct ieee80211_hw *hw) | |||
190 | long rssi_val_min = 0; | 190 | long rssi_val_min = 0; |
191 | 191 | ||
192 | if ((dm_digtable->curmultista_connectstate == DIG_MULTISTA_CONNECT) && | 192 | if ((dm_digtable->curmultista_connectstate == DIG_MULTISTA_CONNECT) && |
193 | (dm_digtable->cursta_connectctate == DIG_STA_CONNECT)) { | 193 | (dm_digtable->cursta_connectstate == DIG_STA_CONNECT)) { |
194 | if (rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb != 0) | 194 | if (rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb != 0) |
195 | rssi_val_min = | 195 | rssi_val_min = |
196 | (rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb > | 196 | (rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb > |
@@ -199,8 +199,8 @@ static u8 rtl92c_dm_initial_gain_min_pwdb(struct ieee80211_hw *hw) | |||
199 | rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb; | 199 | rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb; |
200 | else | 200 | else |
201 | rssi_val_min = rtlpriv->dm.undecorated_smoothed_pwdb; | 201 | rssi_val_min = rtlpriv->dm.undecorated_smoothed_pwdb; |
202 | } else if (dm_digtable->cursta_connectctate == DIG_STA_CONNECT || | 202 | } else if (dm_digtable->cursta_connectstate == DIG_STA_CONNECT || |
203 | dm_digtable->cursta_connectctate == DIG_STA_BEFORE_CONNECT) { | 203 | dm_digtable->cursta_connectstate == DIG_STA_BEFORE_CONNECT) { |
204 | rssi_val_min = rtlpriv->dm.undecorated_smoothed_pwdb; | 204 | rssi_val_min = rtlpriv->dm.undecorated_smoothed_pwdb; |
205 | } else if (dm_digtable->curmultista_connectstate == | 205 | } else if (dm_digtable->curmultista_connectstate == |
206 | DIG_MULTISTA_CONNECT) { | 206 | DIG_MULTISTA_CONNECT) { |
@@ -334,7 +334,7 @@ static void rtl92c_dm_initial_gain_multi_sta(struct ieee80211_hw *hw) | |||
334 | multi_sta = true; | 334 | multi_sta = true; |
335 | 335 | ||
336 | if (!multi_sta || | 336 | if (!multi_sta || |
337 | dm_digtable->cursta_connectctate != DIG_STA_DISCONNECT) { | 337 | dm_digtable->cursta_connectstate != DIG_STA_DISCONNECT) { |
338 | initialized = false; | 338 | initialized = false; |
339 | dm_digtable->dig_ext_port_stage = DIG_EXT_PORT_STAGE_MAX; | 339 | dm_digtable->dig_ext_port_stage = DIG_EXT_PORT_STAGE_MAX; |
340 | return; | 340 | return; |
@@ -378,15 +378,15 @@ static void rtl92c_dm_initial_gain_sta(struct ieee80211_hw *hw) | |||
378 | struct dig_t *dm_digtable = &rtlpriv->dm_digtable; | 378 | struct dig_t *dm_digtable = &rtlpriv->dm_digtable; |
379 | 379 | ||
380 | RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE, | 380 | RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE, |
381 | "presta_connectstate = %x, cursta_connectctate = %x\n", | 381 | "presta_connectstate = %x, cursta_connectstate = %x\n", |
382 | dm_digtable->presta_connectstate, | 382 | dm_digtable->presta_connectstate, |
383 | dm_digtable->cursta_connectctate); | 383 | dm_digtable->cursta_connectstate); |
384 | 384 | ||
385 | if (dm_digtable->presta_connectstate == dm_digtable->cursta_connectctate | 385 | if (dm_digtable->presta_connectstate == dm_digtable->cursta_connectstate |
386 | || dm_digtable->cursta_connectctate == DIG_STA_BEFORE_CONNECT | 386 | || dm_digtable->cursta_connectstate == DIG_STA_BEFORE_CONNECT |
387 | || dm_digtable->cursta_connectctate == DIG_STA_CONNECT) { | 387 | || dm_digtable->cursta_connectstate == DIG_STA_CONNECT) { |
388 | 388 | ||
389 | if (dm_digtable->cursta_connectctate != DIG_STA_DISCONNECT) { | 389 | if (dm_digtable->cursta_connectstate != DIG_STA_DISCONNECT) { |
390 | dm_digtable->rssi_val_min = | 390 | dm_digtable->rssi_val_min = |
391 | rtl92c_dm_initial_gain_min_pwdb(hw); | 391 | rtl92c_dm_initial_gain_min_pwdb(hw); |
392 | rtl92c_dm_ctrl_initgain_by_rssi(hw); | 392 | rtl92c_dm_ctrl_initgain_by_rssi(hw); |
@@ -407,7 +407,7 @@ static void rtl92c_dm_cck_packet_detection_thresh(struct ieee80211_hw *hw) | |||
407 | struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); | 407 | struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); |
408 | struct dig_t *dm_digtable = &rtlpriv->dm_digtable; | 408 | struct dig_t *dm_digtable = &rtlpriv->dm_digtable; |
409 | 409 | ||
410 | if (dm_digtable->cursta_connectctate == DIG_STA_CONNECT) { | 410 | if (dm_digtable->cursta_connectstate == DIG_STA_CONNECT) { |
411 | dm_digtable->rssi_val_min = rtl92c_dm_initial_gain_min_pwdb(hw); | 411 | dm_digtable->rssi_val_min = rtl92c_dm_initial_gain_min_pwdb(hw); |
412 | 412 | ||
413 | if (dm_digtable->pre_cck_pd_state == CCK_PD_STAGE_LowRssi) { | 413 | if (dm_digtable->pre_cck_pd_state == CCK_PD_STAGE_LowRssi) { |
@@ -484,15 +484,15 @@ static void rtl92c_dm_ctrl_initgain_by_twoport(struct ieee80211_hw *hw) | |||
484 | return; | 484 | return; |
485 | 485 | ||
486 | if (mac->link_state >= MAC80211_LINKED) | 486 | if (mac->link_state >= MAC80211_LINKED) |
487 | dm_digtable->cursta_connectctate = DIG_STA_CONNECT; | 487 | dm_digtable->cursta_connectstate = DIG_STA_CONNECT; |
488 | else | 488 | else |
489 | dm_digtable->cursta_connectctate = DIG_STA_DISCONNECT; | 489 | dm_digtable->cursta_connectstate = DIG_STA_DISCONNECT; |
490 | 490 | ||
491 | rtl92c_dm_initial_gain_sta(hw); | 491 | rtl92c_dm_initial_gain_sta(hw); |
492 | rtl92c_dm_initial_gain_multi_sta(hw); | 492 | rtl92c_dm_initial_gain_multi_sta(hw); |
493 | rtl92c_dm_cck_packet_detection_thresh(hw); | 493 | rtl92c_dm_cck_packet_detection_thresh(hw); |
494 | 494 | ||
495 | dm_digtable->presta_connectstate = dm_digtable->cursta_connectctate; | 495 | dm_digtable->presta_connectstate = dm_digtable->cursta_connectstate; |
496 | 496 | ||
497 | } | 497 | } |
498 | 498 | ||
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/dm.c b/drivers/net/wireless/rtlwifi/rtl8192de/dm.c index c0201ed69dd7..ed868c396c25 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192de/dm.c +++ b/drivers/net/wireless/rtlwifi/rtl8192de/dm.c | |||
@@ -164,7 +164,7 @@ static void rtl92d_dm_diginit(struct ieee80211_hw *hw) | |||
164 | de_digtable->dig_ext_port_stage = DIG_EXT_PORT_STAGE_MAX; | 164 | de_digtable->dig_ext_port_stage = DIG_EXT_PORT_STAGE_MAX; |
165 | de_digtable->cur_igvalue = 0x20; | 165 | de_digtable->cur_igvalue = 0x20; |
166 | de_digtable->pre_igvalue = 0x0; | 166 | de_digtable->pre_igvalue = 0x0; |
167 | de_digtable->cursta_connectctate = DIG_STA_DISCONNECT; | 167 | de_digtable->cursta_connectstate = DIG_STA_DISCONNECT; |
168 | de_digtable->presta_connectstate = DIG_STA_DISCONNECT; | 168 | de_digtable->presta_connectstate = DIG_STA_DISCONNECT; |
169 | de_digtable->curmultista_connectstate = DIG_MULTISTA_DISCONNECT; | 169 | de_digtable->curmultista_connectstate = DIG_MULTISTA_DISCONNECT; |
170 | de_digtable->rssi_lowthresh = DM_DIG_THRESH_LOW; | 170 | de_digtable->rssi_lowthresh = DM_DIG_THRESH_LOW; |
@@ -310,7 +310,7 @@ static void rtl92d_dm_cck_packet_detection_thresh(struct ieee80211_hw *hw) | |||
310 | struct dig_t *de_digtable = &rtlpriv->dm_digtable; | 310 | struct dig_t *de_digtable = &rtlpriv->dm_digtable; |
311 | unsigned long flag = 0; | 311 | unsigned long flag = 0; |
312 | 312 | ||
313 | if (de_digtable->cursta_connectctate == DIG_STA_CONNECT) { | 313 | if (de_digtable->cursta_connectstate == DIG_STA_CONNECT) { |
314 | if (de_digtable->pre_cck_pd_state == CCK_PD_STAGE_LOWRSSI) { | 314 | if (de_digtable->pre_cck_pd_state == CCK_PD_STAGE_LOWRSSI) { |
315 | if (de_digtable->min_undecorated_pwdb_for_dm <= 25) | 315 | if (de_digtable->min_undecorated_pwdb_for_dm <= 25) |
316 | de_digtable->cur_cck_pd_state = | 316 | de_digtable->cur_cck_pd_state = |
@@ -342,7 +342,7 @@ static void rtl92d_dm_cck_packet_detection_thresh(struct ieee80211_hw *hw) | |||
342 | de_digtable->pre_cck_pd_state = de_digtable->cur_cck_pd_state; | 342 | de_digtable->pre_cck_pd_state = de_digtable->cur_cck_pd_state; |
343 | } | 343 | } |
344 | RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "CurSTAConnectState=%s\n", | 344 | RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "CurSTAConnectState=%s\n", |
345 | de_digtable->cursta_connectctate == DIG_STA_CONNECT ? | 345 | de_digtable->cursta_connectstate == DIG_STA_CONNECT ? |
346 | "DIG_STA_CONNECT " : "DIG_STA_DISCONNECT"); | 346 | "DIG_STA_CONNECT " : "DIG_STA_DISCONNECT"); |
347 | RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "CCKPDStage=%s\n", | 347 | RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "CCKPDStage=%s\n", |
348 | de_digtable->cur_cck_pd_state == CCK_PD_STAGE_LOWRSSI ? | 348 | de_digtable->cur_cck_pd_state == CCK_PD_STAGE_LOWRSSI ? |
@@ -428,9 +428,9 @@ static void rtl92d_dm_dig(struct ieee80211_hw *hw) | |||
428 | RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "progress\n"); | 428 | RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "progress\n"); |
429 | /* Decide the current status and if modify initial gain or not */ | 429 | /* Decide the current status and if modify initial gain or not */ |
430 | if (rtlpriv->mac80211.link_state >= MAC80211_LINKED) | 430 | if (rtlpriv->mac80211.link_state >= MAC80211_LINKED) |
431 | de_digtable->cursta_connectctate = DIG_STA_CONNECT; | 431 | de_digtable->cursta_connectstate = DIG_STA_CONNECT; |
432 | else | 432 | else |
433 | de_digtable->cursta_connectctate = DIG_STA_DISCONNECT; | 433 | de_digtable->cursta_connectstate = DIG_STA_DISCONNECT; |
434 | 434 | ||
435 | /* adjust initial gain according to false alarm counter */ | 435 | /* adjust initial gain according to false alarm counter */ |
436 | if (falsealm_cnt->cnt_all < DM_DIG_FA_TH0) | 436 | if (falsealm_cnt->cnt_all < DM_DIG_FA_TH0) |
diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h index 40153e7bf702..a15c11280980 100644 --- a/drivers/net/wireless/rtlwifi/wifi.h +++ b/drivers/net/wireless/rtlwifi/wifi.h | |||
@@ -1624,7 +1624,7 @@ struct dig_t { | |||
1624 | u8 dig_twoport_algorithm; | 1624 | u8 dig_twoport_algorithm; |
1625 | u8 dig_dbgmode; | 1625 | u8 dig_dbgmode; |
1626 | u8 dig_slgorithm_switch; | 1626 | u8 dig_slgorithm_switch; |
1627 | u8 cursta_connectctate; | 1627 | u8 cursta_connectstate; |
1628 | u8 presta_connectstate; | 1628 | u8 presta_connectstate; |
1629 | u8 curmultista_connectstate; | 1629 | u8 curmultista_connectstate; |
1630 | char backoff_val; | 1630 | char backoff_val; |