On Fri, 2014-03-14 at 01:16:15 +0800, John W. Linville wrote:
> Commit 3ebe8e257307a87c33460aa7d2b75dadd374ed9c ("ieee80211: remove
> function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}") removed
> ieee80211_dsss_chan_to_freq, but it neglected to account for this
> staging driver...
Hi, John.
I have submited a similar patch to staging/staging-next tree, and it was
applied in that tree on Feb 18, the commit is 4e5e9d7c66f04 on that
tree. But my patch add a variable to deal with 80 characters
problem. I'm not sure if your patch is applied to wireless-next, then
there could be a conflict in future time.
I separated the wireless tree patches and staging tree patch to
different maintainers when doing that change. If I knew the staging driver
change can happen on wireless tree, I should have combined them in one place.
>
> Cc: Zhao, Gang <gamerh2o@xxxxxxxxx>
> Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
> ---
> drivers/staging/wlan-ng/cfg80211.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/staging/wlan-ng/cfg80211.c b/drivers/staging/wlan-ng/cfg80211.c
> index a7d24c95191d..7dd2b95416e8 100644
> --- a/drivers/staging/wlan-ng/cfg80211.c
> +++ b/drivers/staging/wlan-ng/cfg80211.c
> @@ -416,7 +416,7 @@ static int prism2_scan(struct wiphy *wiphy,
> memcpy(&ie_buf[2], &(msg2.ssid.data.data), msg2.ssid.data.len);
> bss = cfg80211_inform_bss(wiphy,
> ieee80211_get_channel(wiphy,
> - ieee80211_dsss_chan_to_freq(msg2.dschannel.data)),
> + ieee80211_channel_to_frequency(msg2.dschannel.data, IEEE80211_BAND_2GHZ)),
> (const u8 *) &(msg2.bssid.data.data),
> msg2.timestamp.data, msg2.capinfo.data,
> msg2.beaconperiod.data,
--
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
