diff options
| author | Stanislaw Gruszka <sgruszka@redhat.com> | 2012-02-03 17:31:55 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-06 14:56:09 -0500 |
| commit | dee9a09eb34a272494a315fe0c19e49b6375a000 (patch) | |
| tree | 98f5eb51aa843b5a4d15e56c93f9836cf20301b0 /drivers/net/wireless/iwlegacy/common.c | |
| parent | eb123af3d1e038c486fc8fcf19518133883792d5 (diff) | |
iwlegacy: get rid of ctx->is_active
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlegacy/common.c')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/common.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c index db2e8bb11fa1..13bd3a8c21b1 100644 --- a/drivers/net/wireless/iwlegacy/common.c +++ b/drivers/net/wireless/iwlegacy/common.c @@ -4537,7 +4537,6 @@ static int il_setup_interface(struct il_priv *il, struct il_rxon_context *ctx) { struct ieee80211_vif *vif = ctx->vif; - int err; lockdep_assert_held(&il->mutex); @@ -4548,16 +4547,7 @@ il_setup_interface(struct il_priv *il, struct il_rxon_context *ctx) */ il->iw_mode = vif->type; - ctx->is_active = true; - - err = il_set_mode(il, ctx); - if (err) { - if (!ctx->always_active) - ctx->is_active = false; - return err; - } - - return 0; + return il_set_mode(il, ctx); } int @@ -4612,11 +4602,9 @@ il_teardown_interface(struct il_priv *il, struct ieee80211_vif *vif, il_force_scan_end(il); } - if (!mode_change) { + if (!mode_change) il_set_mode(il, ctx); - if (!ctx->always_active) - ctx->is_active = false; - } + } void @@ -5227,9 +5215,6 @@ il_update_qos(struct il_priv *il, struct il_rxon_context *ctx) if (test_bit(S_EXIT_PENDING, &il->status)) return; - if (!ctx->is_active) - return; - il->qos_data.def_qos_parm.qos_flags = 0; if (il->qos_data.qos_active) |