summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/iwlegacy/common.c
diff options
context:
space:
mode:
authorStanislaw Gruszka <sgruszka@redhat.com>2012-02-03 17:31:56 +0100
committerJohn W. Linville <linville@tuxdriver.com>2012-02-06 14:56:10 -0500
commit20c47eba7001680e62878c5b20e487a8b0b873ad (patch)
treebae391aa49008d1d30252319b048a1cdc4e57ef1 /drivers/net/wireless/iwlegacy/common.c
parentdee9a09eb34a272494a315fe0c19e49b6375a000 (diff)
iwlegacy: remove il_setup_interface()
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.c22
1 files changed, 3 insertions, 19 deletions
diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c
index 13bd3a8c21b1..ea2fa97fa36b 100644
--- a/drivers/net/wireless/iwlegacy/common.c
+++ b/drivers/net/wireless/iwlegacy/common.c
@@ -4533,23 +4533,6 @@ il_set_mode(struct il_priv *il, struct il_rxon_context *ctx)
return il_commit_rxon(il, ctx);
}
-static int
-il_setup_interface(struct il_priv *il, struct il_rxon_context *ctx)
-{
- struct ieee80211_vif *vif = ctx->vif;
-
- lockdep_assert_held(&il->mutex);
-
- /*
- * This variable will be correct only when there's just
- * a single context, but all code using it is for hardware
- * that supports only one context.
- */
- il->iw_mode = vif->type;
-
- return il_set_mode(il, ctx);
-}
-
int
il_mac_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
{
@@ -4574,8 +4557,9 @@ il_mac_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
vif_priv->ctx = &il->ctx;
il->ctx.vif = vif;
+ il->iw_mode = vif->type;
- err = il_setup_interface(il, &il->ctx);
+ err = il_set_mode(il, &il->ctx);
if (err) {
il->ctx.vif = NULL;
il->iw_mode = NL80211_IFTYPE_STATION;
@@ -4978,7 +4962,7 @@ il_mac_change_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
il_teardown_interface(il, vif, true);
vif->type = newtype;
vif->p2p = false;
- err = il_setup_interface(il, ctx);
+ err = il_set_mode(il, ctx);
WARN_ON(err);
/*
* We've switched internally, but submitting to the