diff options
author | Amitkumar Karwar <akarwar@marvell.com> | 2014-02-07 19:27:31 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-02-12 15:36:18 -0500 |
commit | 341b88007275121e9d85e3e38fc6b7546a4e7e9d (patch) | |
tree | 3a48351c5018bf4427cc4c8fce48f06ca70df73f /drivers/net/wireless/mwifiex/scan.c | |
parent | 4bcf93d3a4d6f145e9d871afc4797018d33c4bb1 (diff) |
mwifiex: cleanup in mwifiex_fill_cap_info()
Pass 'struct ieee80211_ht_cap' pointer to
mwifiex_fill_cap_info() instead of
'struct mwifiex_ie_types_htcap' pointer, because the routine
internally uses the later one.
This patch also adds WARN_ON_ONCE check for NULL band.
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/mwifiex/scan.c')
-rw-r--r-- | drivers/net/wireless/mwifiex/scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c index c548a7d4877d..92adbb1ebabc 100644 --- a/drivers/net/wireless/mwifiex/scan.c +++ b/drivers/net/wireless/mwifiex/scan.c | |||
@@ -957,7 +957,7 @@ mwifiex_config_scan(struct mwifiex_private *priv, | |||
957 | cpu_to_le16(sizeof(struct ieee80211_ht_cap)); | 957 | cpu_to_le16(sizeof(struct ieee80211_ht_cap)); |
958 | radio_type = | 958 | radio_type = |
959 | mwifiex_band_to_radio_type(priv->adapter->config_bands); | 959 | mwifiex_band_to_radio_type(priv->adapter->config_bands); |
960 | mwifiex_fill_cap_info(priv, radio_type, ht_cap); | 960 | mwifiex_fill_cap_info(priv, radio_type, &ht_cap->ht_cap); |
961 | tlv_pos += sizeof(struct mwifiex_ie_types_htcap); | 961 | tlv_pos += sizeof(struct mwifiex_ie_types_htcap); |
962 | } | 962 | } |
963 | 963 | ||