iwlegacy: remove il_setup_interface()
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c
index 13bd3a8..ea2fa97 100644
--- a/drivers/net/wireless/iwlegacy/common.c
+++ b/drivers/net/wireless/iwlegacy/common.c
@@ -4533,23 +4533,6 @@
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 @@
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_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