On Fri, Jul 27, 2012 at 2:16 PM, Johannes Berg <johannes@xxxxxxxxxxxxxxxx> wrote: > From: Johannes Berg <johannes.berg@xxxxxxxxx> > > Instead of operating on a single channel only, > use the new channel context infrastructure in > all mac80211 code. > > This enables drivers that want to use the new > channel context infrastructure to use multiple > channels, while nothing should change for all > the other drivers that don't support it. > > Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx> [...] > static int ieee80211_set_monitor_channel(struct wiphy *wiphy, > struct ieee80211_channel *chan, > enum nl80211_channel_type channel_type) > { > - return ieee80211_set_channel(wiphy, NULL, chan, channel_type); > + return 0; > +//return ieee80211_set_channel(wiphy, NULL, chan, channel_type); typo? [...] > @@ -1278,11 +1271,6 @@ int ieee80211_if_change_type(struct ieee80211_sub_if_data *sdata, > if (type == ieee80211_vif_type_p2p(&sdata->vif)) > return 0; > > - /* Setting ad-hoc mode on non-IBSS channel is not supported. */ > - if (sdata->local->oper_channel->flags & IEEE80211_CHAN_NO_IBSS && > - type == NL80211_IFTYPE_ADHOC) > - return -EOPNOTSUPP; > - > if (ieee80211_sdata_running(sdata)) { > ret = ieee80211_runtime_change_iftype(sdata, type); > if (ret) > @@ -1294,9 +1282,6 @@ int ieee80211_if_change_type(struct ieee80211_sub_if_data *sdata, > } > > /* reset some values that shouldn't be kept across type changes */ > - sdata->vif.bss_conf.basic_rates = > - ieee80211_mandatory_rates(sdata->local, > - sdata->local->oper_channel->band); was this a bug? shouldn't be updated to use the channel context? Arik -- 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