Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e5e9d7c authored by Zhao, Gang's avatar Zhao, Gang Committed by Greg Kroah-Hartman
Browse files

staging: wlan-ng: replace function ieee80211_dsss_chan_to_freq() 



Replace ieee80211_dsss_chan_to_freq() with more generic
ieee80211_channel_to_frequency(), and add a variable to deal with 80
characters problem.

File cfg80211.c is included by p80211netdev.c, p80211netdev.c includes
<net/cfg80211.h>, both ieee80211_channel_to_frequency() and
IEEE80211_BAND_2GHZ is defined / declared in <net/cfg80211.h>. So this
change is safe.

This change is a preparation for the removal of function
ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}.

Signed-off-by: default avatarZhao, Gang <gamerh2o@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 75bc5fad

drivers/staging/wlan-ng/cfg80211.c

+5 −2
Original line number Diff line number Diff line
@@ -400,6 +400,8 @@ static int prism2_scan(struct wiphy *wiphy, 
	numbss = msg1.numbss.data;



	for (i = 0; i < numbss; i++) {

		int freq;



		memset(&msg2, 0, sizeof(msg2));

		msg2.msgcode = DIDmsg_dot11req_scan_results;

		msg2.bssindex.data = i;
@@ -414,9 +416,10 @@ static int prism2_scan(struct wiphy *wiphy, 
		ie_buf[1] = msg2.ssid.data.len;

		ie_len = ie_buf[1] + 2;

		memcpy(&ie_buf[2], &(msg2.ssid.data.data), msg2.ssid.data.len);

		freq = ieee80211_channel_to_frequency(msg2.dschannel.data,

						      IEEE80211_BAND_2GHZ);

		bss = cfg80211_inform_bss(wiphy,

			ieee80211_get_channel(wiphy,

			      ieee80211_dsss_chan_to_freq(msg2.dschannel.data)),

			ieee80211_get_channel(wiphy, freq),

			(const u8 *) &(msg2.bssid.data.data),

			msg2.timestamp.data, msg2.capinfo.data,

			msg2.beaconperiod.data,