On Mon, 2011-12-19 at 12:00 +0200, Eliad Peller wrote: > Implement the change_interface callback by simply removing the > current vif and adding a new one after updating the vif type. > > Signed-off-by: Eliad Peller <eliad@xxxxxxxxxx> > --- > v2: update vif->p2p as well > > drivers/net/wireless/wl12xx/main.c | 12 ++++++++++++ > 1 files changed, 12 insertions(+), 0 deletions(-) > > diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c > index c305841..82fc318 100644 > --- a/drivers/net/wireless/wl12xx/main.c > +++ b/drivers/net/wireless/wl12xx/main.c > @@ -2269,6 +2269,17 @@ out: > cancel_work_sync(&wl->recovery_work); > } > > +static int wl12xx_op_change_interface(struct ieee80211_hw *hw, > + struct ieee80211_vif *vif, > + enum nl80211_iftype new_type, bool p2p) > +{ > + wl1271_op_remove_interface(hw, vif); > + > + vif->type = ieee80211_iftype_p2p(new_type, p2p); > + vif->p2p = p2p; > + return wl1271_op_add_interface(hw, vif); > +} > + As Arik already commented, this looks a bit weird. Shouldn't the type and p2p elements be changed in mac80211 itself? What about doing so if the op_change_interface returns success? Currently, the opposite seems to happen (ie. mac80211 changes type back to the original vif.type if the op fails). Also, it seems that the p2p value will be overwritten in the ieee80211_setup_sdata() which is called just after this op returns, so there's no use to do it here. -- Cheers, Luca. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html