mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-13 17:36:46 +07:00
iwlwifi: use iwl_is_associated when possible
This patch add uses of iwl_is_associated in places it is suitable in. Signed-off-by: Ron Rindjunsky <ron.rindjunsky@intel.com> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
24e5c40130
commit
5d1e2325ac
@ -970,7 +970,7 @@ static int iwl3945_full_rxon_required(struct iwl3945_priv *priv)
|
||||
{
|
||||
|
||||
/* These items are only settable from the full RXON command */
|
||||
if (!(priv->active_rxon.filter_flags & RXON_FILTER_ASSOC_MSK) ||
|
||||
if (!(iwl3945_is_associated(priv)) ||
|
||||
compare_ether_addr(priv->staging_rxon.bssid_addr,
|
||||
priv->active_rxon.bssid_addr) ||
|
||||
compare_ether_addr(priv->staging_rxon.node_addr,
|
||||
@ -6836,7 +6836,7 @@ static void iwl3945_config_ap(struct iwl3945_priv *priv)
|
||||
return;
|
||||
|
||||
/* The following should be done only at AP bring up */
|
||||
if ((priv->active_rxon.filter_flags & RXON_FILTER_ASSOC_MSK) == 0) {
|
||||
if (!(iwl3945_is_associated(priv))) {
|
||||
|
||||
/* RXON - unassoc (to set timing command) */
|
||||
priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
|
||||
|
@ -192,7 +192,7 @@ static int iwl4965_full_rxon_required(struct iwl_priv *priv)
|
||||
{
|
||||
|
||||
/* These items are only settable from the full RXON command */
|
||||
if (!(priv->active_rxon.filter_flags & RXON_FILTER_ASSOC_MSK) ||
|
||||
if (!(iwl_is_associated(priv)) ||
|
||||
compare_ether_addr(priv->staging_rxon.bssid_addr,
|
||||
priv->active_rxon.bssid_addr) ||
|
||||
compare_ether_addr(priv->staging_rxon.node_addr,
|
||||
@ -3008,7 +3008,7 @@ static void iwl4965_config_ap(struct iwl_priv *priv)
|
||||
return;
|
||||
|
||||
/* The following should be done only at AP bring up */
|
||||
if ((priv->active_rxon.filter_flags & RXON_FILTER_ASSOC_MSK) == 0) {
|
||||
if (!(iwl_is_associated(priv))) {
|
||||
|
||||
/* RXON - unassoc (to set timing command) */
|
||||
priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
|
||||
|
Loading…
Reference in New Issue
Block a user