On 06/05/2013 01:53 PM, Antonio Quartulli wrote:
From: Antonio Quartulli <antonio@xxxxxxxxxxxxx> cfg80211 passes a NULL channel to mgmt_tx if the frame has to be sent on the one currently in use by the device. Make the implementation of mgmt_tx correctly handle this case Cc: Arend van Spriel <arend@xxxxxxxxxxxx> Cc: brcm80211-dev-list@xxxxxxxxxxxx Signed-off-by: Antonio Quartulli <antonio@xxxxxxxxxxxxx> --- drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c index 6d758f2..dcb0c00 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c @@ -3917,6 +3917,7 @@ brcmf_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, struct brcmf_fil_af_params_le *af_params; bool ack; s32 chan_nr; + u32 freq; brcmf_dbg(TRACE, "Enter\n"); @@ -3968,8 +3969,13 @@ brcmf_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, memcpy(&af_params->bssid[0], &mgmt->bssid[0], ETH_ALEN); /* Add the length exepted for 802.11 header */ action_frame->len = cpu_to_le16(len - DOT11_MGMT_HDR_LEN); - /* Add the channel */ - chan_nr = ieee80211_frequency_to_channel(chan->center_freq); + /* Add the channel. Default to the current one, but use the one + * specified as parameter if any + */ + freq = cfg->channel; + if (chan) + freq = chan->center_freq; + chan_nr = ieee80211_frequency_to_channel(freq);
Could you get rid of 'freq' variable and use ieee80211_frequency_to_channel() on cfg->channel or chan->center_freq.
Another thing is that cfg->channel can be zero resulting in chan_nr being zero. I had a quick look whether the device firmware can handle this. I suspect not, but I will need to ask to be sure.
Regards, Arend -- 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
