mac80211/cfg80211: move iwrange handler to cfg80211
The previous patch made cfg80211 generally aware of the signal type a given hardware will give, so now it can implement SIOCGIWRANGE itself, removing more wext stuff from mac80211. Might need to be a little more parametrized once we have more hardware using cfg80211 and new hardware capabilities. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:

committed by
John W. Linville

parent
77965c970d
commit
4aa188e1a8
@@ -137,3 +137,100 @@ int cfg80211_wext_giwmode(struct net_device *dev, struct iw_request_info *info,
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(cfg80211_wext_giwmode);
|
||||
|
||||
|
||||
int cfg80211_wext_giwrange(struct net_device *dev,
|
||||
struct iw_request_info *info,
|
||||
struct iw_point *data, char *extra)
|
||||
{
|
||||
struct wireless_dev *wdev = dev->ieee80211_ptr;
|
||||
struct iw_range *range = (struct iw_range *) extra;
|
||||
enum ieee80211_band band;
|
||||
int c = 0;
|
||||
|
||||
if (!wdev)
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
data->length = sizeof(struct iw_range);
|
||||
memset(range, 0, sizeof(struct iw_range));
|
||||
|
||||
range->we_version_compiled = WIRELESS_EXT;
|
||||
range->we_version_source = 21;
|
||||
range->retry_capa = IW_RETRY_LIMIT;
|
||||
range->retry_flags = IW_RETRY_LIMIT;
|
||||
range->min_retry = 0;
|
||||
range->max_retry = 255;
|
||||
range->min_rts = 0;
|
||||
range->max_rts = 2347;
|
||||
range->min_frag = 256;
|
||||
range->max_frag = 2346;
|
||||
|
||||
range->encoding_size[0] = 5;
|
||||
range->encoding_size[1] = 13;
|
||||
range->num_encoding_sizes = 2;
|
||||
range->max_encoding_tokens = 4;
|
||||
|
||||
range->max_qual.updated = IW_QUAL_NOISE_INVALID;
|
||||
|
||||
switch (wdev->wiphy->signal_type) {
|
||||
case CFG80211_SIGNAL_TYPE_NONE:
|
||||
break;
|
||||
case CFG80211_SIGNAL_TYPE_MBM:
|
||||
range->max_qual.level = -110;
|
||||
range->max_qual.qual = 70;
|
||||
range->avg_qual.qual = 35;
|
||||
range->max_qual.updated |= IW_QUAL_DBM;
|
||||
range->max_qual.updated |= IW_QUAL_QUAL_UPDATED;
|
||||
range->max_qual.updated |= IW_QUAL_LEVEL_UPDATED;
|
||||
break;
|
||||
case CFG80211_SIGNAL_TYPE_UNSPEC:
|
||||
range->max_qual.level = 100;
|
||||
range->max_qual.qual = 100;
|
||||
range->avg_qual.qual = 50;
|
||||
range->max_qual.updated |= IW_QUAL_QUAL_UPDATED;
|
||||
range->max_qual.updated |= IW_QUAL_LEVEL_UPDATED;
|
||||
break;
|
||||
}
|
||||
|
||||
range->avg_qual.level = range->max_qual.level / 2;
|
||||
range->avg_qual.noise = range->max_qual.noise / 2;
|
||||
range->avg_qual.updated = range->max_qual.updated;
|
||||
|
||||
range->enc_capa = IW_ENC_CAPA_WPA | IW_ENC_CAPA_WPA2 |
|
||||
IW_ENC_CAPA_CIPHER_TKIP | IW_ENC_CAPA_CIPHER_CCMP;
|
||||
|
||||
|
||||
for (band = 0; band < IEEE80211_NUM_BANDS; band ++) {
|
||||
int i;
|
||||
struct ieee80211_supported_band *sband;
|
||||
|
||||
sband = wdev->wiphy->bands[band];
|
||||
|
||||
if (!sband)
|
||||
continue;
|
||||
|
||||
for (i = 0; i < sband->n_channels && c < IW_MAX_FREQUENCIES; i++) {
|
||||
struct ieee80211_channel *chan = &sband->channels[i];
|
||||
|
||||
if (!(chan->flags & IEEE80211_CHAN_DISABLED)) {
|
||||
range->freq[c].i =
|
||||
ieee80211_frequency_to_channel(
|
||||
chan->center_freq);
|
||||
range->freq[c].m = chan->center_freq;
|
||||
range->freq[c].e = 6;
|
||||
c++;
|
||||
}
|
||||
}
|
||||
}
|
||||
range->num_channels = c;
|
||||
range->num_frequency = c;
|
||||
|
||||
IW_EVENT_CAPA_SET_KERNEL(range->event_capa);
|
||||
IW_EVENT_CAPA_SET(range->event_capa, SIOCGIWAP);
|
||||
IW_EVENT_CAPA_SET(range->event_capa, SIOCGIWSCAN);
|
||||
|
||||
range->scan_capa |= IW_SCAN_CAPA_ESSID;
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(cfg80211_wext_giwrange);
|
||||
|
Reference in New Issue
Block a user