From 25062d28114dc102f5466ce7212e8f43ef62cb13 Mon Sep 17 00:00:00 2001 From: Eliad Peller Date: Sun, 4 Mar 2012 10:55:50 +0200 Subject: [PATCH] --- yaml --- r: 291285 b: refs/heads/master c: 249e9698899643a799951a6e772facae346f0941 h: refs/heads/master i: 291283: efde036134dc4b8eb341376eabf8982a7d98eff6 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/wl12xx/main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3cf912bbc36d..a46293c78e97 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b32b2b0f8ea82cb51d70b88815c25e0f1c0cf7a5 +refs/heads/master: 249e9698899643a799951a6e772facae346f0941 diff --git a/trunk/drivers/net/wireless/wl12xx/main.c b/trunk/drivers/net/wireless/wl12xx/main.c index a330b0c0ae61..65f91d7bad31 100644 --- a/trunk/drivers/net/wireless/wl12xx/main.c +++ b/trunk/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);