On Mon, 2012-08-06 at 18:21 +0300, Arik Nemtsov wrote:

quoted

 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?

[...]

More "todo", but this was indeed missing. I have addressed it in my new
versions in the mac80211-next/wip branch.

quoted

@@ -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?

Well, the first was a leftover from before we even had an explicit IBSS
join operation -- now the (default) channel is just checked when you try
to join an IBSS, so the code in the first hunk has truly been
unnecessary for quite a while.

The second hunk ... similar story, it should be set whenever we first
use the interface by starting AP, joining IBSS or connecting to an AP or
mesh or whatever else could happen. So I think it should be safe.

johannes