From: Eliad Peller <eliad@wizery.com>
Date: Sun, 4 Mar 2012 08:55:50 +0000 (+0200)
Subject: wl12xx: set correct vif type in change_interface callback
X-Git-Tag: v3.4-rc1~177^2~108^2~39^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=249e9698899643a799951a6e772facae346f0941;p=thirdparty%2Fkernel%2Flinux.git

wl12xx: set correct vif type in change_interface callback

In some cases, the wrong vif type was set in the
change_interface callback (P2P_CLIENT/P2P_GO instead
of STA/AP)

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
---

diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index a330b0c0ae619..65f91d7bad31b 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -2336,7 +2336,7 @@ static int wl12xx_op_change_interface(struct ieee80211_hw *hw,
 	set_bit(WL1271_FLAG_VIF_CHANGE_IN_PROGRESS, &wl->flags);
 	wl1271_op_remove_interface(hw, vif);
 
-	vif->type = ieee80211_iftype_p2p(new_type, p2p);
+	vif->type = new_type;
 	vif->p2p = p2p;
 	ret = wl1271_op_add_interface(hw, vif);