On Mon, Nov 19, 2012 at 11:13 PM, Arik Nemtsov <arik@xxxxxxxxxx> wrote:
> On Mon, Nov 19, 2012 at 6:39 PM, Eliad Peller <eliad@xxxxxxxxxx> wrote:
>> implement the reamin_on_channel() callback by starting
>> a dev role (already associated with the current vif)
>> on the requested channel/band.
>>
>> This channel is usually different from the channel
>> of the sta role, so pass it to wl12xx_roc() as well,
>> and notify mac80211 (async) when the fw is ready
>> on the new channel.
>>
>> Signed-off-by: Eliad Peller <eliad@xxxxxxxxxx>
> [...]
>> @@ -1608,7 +1610,7 @@ static int wl12xx_cmd_roc(struct wl1271 *wl, struct wl12xx_vif *wlvif,
>> }
>>
>> cmd->role_id = role_id;
>> - cmd->channel = wlvif->channel;
>> + cmd->channel = channel;
>> switch (wlvif->band) {
>> case IEEE80211_BAND_2GHZ:
>> cmd->band = WLCORE_BAND_2_4GHZ;
>
> This seems wrong... What happens if the roc is on another band from
> the one the vif is connected on?
>
> The dev role is started on the correct band, but the roc will be on
> the band of the wlvif..
>
good catch. i'll fix it.
>> +static int wlcore_op_remain_on_channel(struct ieee80211_hw *hw,
>> + struct ieee80211_vif *vif,
>> + struct ieee80211_channel *chan,
>> + enum nl80211_channel_type channel_type,
>> + int duration)
>> +{
>> + struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
>> + struct wl1271 *wl = hw->priv;
>> + int channel, ret = 0;
>> +
>> + channel = ieee80211_frequency_to_channel(chan->center_freq);
>> +
>> + wl1271_debug(DEBUG_MAC80211, "mac80211 roc %d (%d)",
>> + channel, wlvif->role_id);
>> +
>> + mutex_lock(&wl->mutex);
>> +
>> + if (unlikely(wl->state != WLCORE_STATE_ON))
>> + goto out;
>> +
>> + /* return EBUSY if we can't ROC right now */
>> + if (WARN_ON(wl->roc_vif ||
>> + find_first_bit(wl->roc_map,
>> + WL12XX_MAX_ROLES) < WL12XX_MAX_ROLES)) {
>> + ret = -EBUSY;
>> + goto out;
>> + }
>> +
>> + /*
>> + * make sure the vif has dev role.
>> + * TODO: enable dev role dynamically instead of pre-allocating it.
>> + */
>
> Not sure what you mean here. Seems pretty dynamic to me..
>
yeah... i referred to the lazy-enable of dev role, but forgot that we
already upstreamed it :)
so i'll just drop this check (as we can start dev role along with any
other role).
>> @@ -5245,6 +5368,8 @@ static int wl1271_init_ieee80211(struct wl1271 *wl)
>> wl->hw->wiphy->max_sched_scan_ie_len = WL1271_CMD_TEMPL_MAX_SIZE -
>> sizeof(struct ieee80211_header);
>>
>> + wl->hw->wiphy->max_remain_on_channel_duration = 5000;
>
> Isn't this the default?
>
only for drivers that don't implement .remain_on_channel (i.e.
implemented by mac80211).
Eliad.
--
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
