Skip to content

Commit

Permalink
mac80211: use ieee80211_get_channel
Browse files Browse the repository at this point in the history
Use the new ieee80211_get_channel() function instead of open-coding it.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Johannes Berg authored and John W. Linville committed Mar 25, 2008
1 parent 906c730 commit e048c6e
Showing 1 changed file with 4 additions and 25 deletions.
29 changes: 4 additions & 25 deletions net/mac80211/ieee80211_ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -279,35 +279,14 @@ static int ieee80211_ioctl_giwmode(struct net_device *dev,

int ieee80211_set_freq(struct ieee80211_local *local, int freqMHz)
{
int set = 0;
int ret = -EINVAL;
enum ieee80211_band band;
struct ieee80211_supported_band *sband;
int i;

for (band = 0; band < IEEE80211_NUM_BANDS; band ++) {
sband = local->hw.wiphy->bands[band];
struct ieee80211_channel *chan;

if (!sband)
continue;
chan = ieee80211_get_channel(local->hw.wiphy, freqMHz);

for (i = 0; i < sband->n_channels; i++) {
struct ieee80211_channel *chan = &sband->channels[i];

if (chan->flags & IEEE80211_CHAN_DISABLED)
continue;

if (chan->center_freq == freqMHz) {
set = 1;
local->oper_channel = chan;
break;
}
}
if (set)
break;
}
if (chan && !(chan->flags & IEEE80211_CHAN_DISABLED)) {
local->oper_channel = chan;

if (set) {
if (local->sta_sw_scanning)
ret = 0;
else
Expand Down

0 comments on commit e048c6e

Please sign in to comment.