lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

iwlwifi: check for valid band for channel info

Browse Source 
when display channel info in debugfs, always check for valid band
before access the pointer and display information

for 1000 NIC, it only support "bgn" mode, so there is no 5.2GHz channels
available to display.

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Wey-Yi Guy
2009-05-22 11:01:55 -07:00
committed by John W. Linville
parent 086ed117c9
commit a2e2322d83
1 changed files with 41 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/wireless/iwlwifi/iwl-debugfs.c
View File

@@ -380,6 +380,7 @@ static ssize_t iwl_dbgfs_channels_read(struct file *file, char __user *user_buf,
} }
supp_band = iwl_get_hw_mode(priv, IEEE80211_BAND_2GHZ); supp_band = iwl_get_hw_mode(priv, IEEE80211_BAND_2GHZ);
if (supp_band) {
channels = supp_band->channels; channels = supp_band->channels;
pos += scnprintf(buf + pos, bufsz - pos, pos += scnprintf(buf + pos, bufsz - pos,
@@ -401,8 +402,9 @@ static ssize_t iwl_dbgfs_channels_read(struct file *file, char __user *user_buf,
channels[i].flags & channels[i].flags &
IEEE80211_CHAN_PASSIVE_SCAN ? IEEE80211_CHAN_PASSIVE_SCAN ?
"passive only" : "active/passive"); "passive only" : "active/passive");
}
supp_band = iwl_get_hw_mode(priv, IEEE80211_BAND_5GHZ); supp_band = iwl_get_hw_mode(priv, IEEE80211_BAND_5GHZ);
if (supp_band) {
channels = supp_band->channels; channels = supp_band->channels;
pos += scnprintf(buf + pos, bufsz - pos, pos += scnprintf(buf + pos, bufsz - pos,
@@ -424,6 +426,7 @@ static ssize_t iwl_dbgfs_channels_read(struct file *file, char __user *user_buf,
channels[i].flags & channels[i].flags &
IEEE80211_CHAN_PASSIVE_SCAN ? IEEE80211_CHAN_PASSIVE_SCAN ?
"passive only" : "active/passive"); "passive only" : "active/passive");
}
ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos); ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
kfree(buf); kfree(buf);
return ret; return ret;