|
@@ -1416,11 +1416,11 @@ static int rs_switch_to_siso(struct iwl_priv *priv,
|
|
|
/*
|
|
/*
|
|
|
* Try to switch to new modulation mode from legacy
|
|
* Try to switch to new modulation mode from legacy
|
|
|
*/
|
|
*/
|
|
|
-static int rs_move_legacy_other(struct iwl_priv *priv,
|
|
|
|
|
- struct iwl_lq_sta *lq_sta,
|
|
|
|
|
- struct ieee80211_conf *conf,
|
|
|
|
|
- struct ieee80211_sta *sta,
|
|
|
|
|
- int index)
|
|
|
|
|
|
|
+static void rs_move_legacy_other(struct iwl_priv *priv,
|
|
|
|
|
+ struct iwl_lq_sta *lq_sta,
|
|
|
|
|
+ struct ieee80211_conf *conf,
|
|
|
|
|
+ struct ieee80211_sta *sta,
|
|
|
|
|
+ int index)
|
|
|
{
|
|
{
|
|
|
struct iwl_scale_tbl_info *tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
|
|
struct iwl_scale_tbl_info *tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
|
|
|
struct iwl_scale_tbl_info *search_tbl =
|
|
struct iwl_scale_tbl_info *search_tbl =
|
|
@@ -1575,7 +1575,7 @@ static int rs_move_legacy_other(struct iwl_priv *priv,
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
search_tbl->lq_type = LQ_NONE;
|
|
search_tbl->lq_type = LQ_NONE;
|
|
|
- return 0;
|
|
|
|
|
|
|
+ return;
|
|
|
|
|
|
|
|
out:
|
|
out:
|
|
|
lq_sta->search_better_tbl = 1;
|
|
lq_sta->search_better_tbl = 1;
|
|
@@ -1584,17 +1584,15 @@ out:
|
|
|
tbl->action = IWL_LEGACY_SWITCH_ANTENNA1;
|
|
tbl->action = IWL_LEGACY_SWITCH_ANTENNA1;
|
|
|
if (update_search_tbl_counter)
|
|
if (update_search_tbl_counter)
|
|
|
search_tbl->action = tbl->action;
|
|
search_tbl->action = tbl->action;
|
|
|
- return 0;
|
|
|
|
|
-
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
/*
|
|
|
* Try to switch to new modulation mode from SISO
|
|
* Try to switch to new modulation mode from SISO
|
|
|
*/
|
|
*/
|
|
|
-static int rs_move_siso_to_other(struct iwl_priv *priv,
|
|
|
|
|
- struct iwl_lq_sta *lq_sta,
|
|
|
|
|
- struct ieee80211_conf *conf,
|
|
|
|
|
- struct ieee80211_sta *sta, int index)
|
|
|
|
|
|
|
+static void rs_move_siso_to_other(struct iwl_priv *priv,
|
|
|
|
|
+ struct iwl_lq_sta *lq_sta,
|
|
|
|
|
+ struct ieee80211_conf *conf,
|
|
|
|
|
+ struct ieee80211_sta *sta, int index)
|
|
|
{
|
|
{
|
|
|
u8 is_green = lq_sta->is_green;
|
|
u8 is_green = lq_sta->is_green;
|
|
|
struct iwl_scale_tbl_info *tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
|
|
struct iwl_scale_tbl_info *tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
|
|
@@ -1747,7 +1745,7 @@ static int rs_move_siso_to_other(struct iwl_priv *priv,
|
|
|
break;
|
|
break;
|
|
|
}
|
|
}
|
|
|
search_tbl->lq_type = LQ_NONE;
|
|
search_tbl->lq_type = LQ_NONE;
|
|
|
- return 0;
|
|
|
|
|
|
|
+ return;
|
|
|
|
|
|
|
|
out:
|
|
out:
|
|
|
lq_sta->search_better_tbl = 1;
|
|
lq_sta->search_better_tbl = 1;
|
|
@@ -1756,17 +1754,15 @@ static int rs_move_siso_to_other(struct iwl_priv *priv,
|
|
|
tbl->action = IWL_SISO_SWITCH_ANTENNA1;
|
|
tbl->action = IWL_SISO_SWITCH_ANTENNA1;
|
|
|
if (update_search_tbl_counter)
|
|
if (update_search_tbl_counter)
|
|
|
search_tbl->action = tbl->action;
|
|
search_tbl->action = tbl->action;
|
|
|
-
|
|
|
|
|
- return 0;
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
/*
|
|
|
* Try to switch to new modulation mode from MIMO2
|
|
* Try to switch to new modulation mode from MIMO2
|
|
|
*/
|
|
*/
|
|
|
-static int rs_move_mimo2_to_other(struct iwl_priv *priv,
|
|
|
|
|
- struct iwl_lq_sta *lq_sta,
|
|
|
|
|
- struct ieee80211_conf *conf,
|
|
|
|
|
- struct ieee80211_sta *sta, int index)
|
|
|
|
|
|
|
+static void rs_move_mimo2_to_other(struct iwl_priv *priv,
|
|
|
|
|
+ struct iwl_lq_sta *lq_sta,
|
|
|
|
|
+ struct ieee80211_conf *conf,
|
|
|
|
|
+ struct ieee80211_sta *sta, int index)
|
|
|
{
|
|
{
|
|
|
s8 is_green = lq_sta->is_green;
|
|
s8 is_green = lq_sta->is_green;
|
|
|
struct iwl_scale_tbl_info *tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
|
|
struct iwl_scale_tbl_info *tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
|
|
@@ -1917,7 +1913,7 @@ static int rs_move_mimo2_to_other(struct iwl_priv *priv,
|
|
|
break;
|
|
break;
|
|
|
}
|
|
}
|
|
|
search_tbl->lq_type = LQ_NONE;
|
|
search_tbl->lq_type = LQ_NONE;
|
|
|
- return 0;
|
|
|
|
|
|
|
+ return;
|
|
|
out:
|
|
out:
|
|
|
lq_sta->search_better_tbl = 1;
|
|
lq_sta->search_better_tbl = 1;
|
|
|
tbl->action++;
|
|
tbl->action++;
|
|
@@ -1926,17 +1922,15 @@ static int rs_move_mimo2_to_other(struct iwl_priv *priv,
|
|
|
if (update_search_tbl_counter)
|
|
if (update_search_tbl_counter)
|
|
|
search_tbl->action = tbl->action;
|
|
search_tbl->action = tbl->action;
|
|
|
|
|
|
|
|
- return 0;
|
|
|
|
|
-
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
/*
|
|
|
* Try to switch to new modulation mode from MIMO3
|
|
* Try to switch to new modulation mode from MIMO3
|
|
|
*/
|
|
*/
|
|
|
-static int rs_move_mimo3_to_other(struct iwl_priv *priv,
|
|
|
|
|
- struct iwl_lq_sta *lq_sta,
|
|
|
|
|
- struct ieee80211_conf *conf,
|
|
|
|
|
- struct ieee80211_sta *sta, int index)
|
|
|
|
|
|
|
+static void rs_move_mimo3_to_other(struct iwl_priv *priv,
|
|
|
|
|
+ struct iwl_lq_sta *lq_sta,
|
|
|
|
|
+ struct ieee80211_conf *conf,
|
|
|
|
|
+ struct ieee80211_sta *sta, int index)
|
|
|
{
|
|
{
|
|
|
s8 is_green = lq_sta->is_green;
|
|
s8 is_green = lq_sta->is_green;
|
|
|
struct iwl_scale_tbl_info *tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
|
|
struct iwl_scale_tbl_info *tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
|
|
@@ -2093,7 +2087,7 @@ static int rs_move_mimo3_to_other(struct iwl_priv *priv,
|
|
|
break;
|
|
break;
|
|
|
}
|
|
}
|
|
|
search_tbl->lq_type = LQ_NONE;
|
|
search_tbl->lq_type = LQ_NONE;
|
|
|
- return 0;
|
|
|
|
|
|
|
+ return;
|
|
|
out:
|
|
out:
|
|
|
lq_sta->search_better_tbl = 1;
|
|
lq_sta->search_better_tbl = 1;
|
|
|
tbl->action++;
|
|
tbl->action++;
|
|
@@ -2101,9 +2095,6 @@ static int rs_move_mimo3_to_other(struct iwl_priv *priv,
|
|
|
tbl->action = IWL_MIMO3_SWITCH_ANTENNA1;
|
|
tbl->action = IWL_MIMO3_SWITCH_ANTENNA1;
|
|
|
if (update_search_tbl_counter)
|
|
if (update_search_tbl_counter)
|
|
|
search_tbl->action = tbl->action;
|
|
search_tbl->action = tbl->action;
|
|
|
-
|
|
|
|
|
- return 0;
|
|
|
|
|
-
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
/*
|