diff options
author | Amitkumar Karwar <akarwar@marvell.com> | 2012-02-28 01:04:14 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-03-05 15:23:13 -0500 |
commit | b9be5f39bdabb25708a9de294c2cae7bdd8dfb17 (patch) | |
tree | 8cbf232af30ab2c5b433712a97a07b1ad6398f40 /drivers/net/wireless/mwifiex/scan.c | |
parent | eb416ad37db897efe9b2a5b79bd671f5966fa443 (diff) |
mwifiex: remove unnecessary struct mwifiex_802_11_ssid
Use struct cfg80211_ssid available in include/net/cfg80211.h
instead of having similar definition in driver.
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 | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c index 8f10038d1b45..67422f64f9fe 100644 --- a/drivers/net/wireless/mwifiex/scan.c +++ b/drivers/net/wireless/mwifiex/scan.c | |||
@@ -163,8 +163,7 @@ mwifiex_is_wpa_oui_present(struct mwifiex_bssdescriptor *bss_desc, u32 cipher) | |||
163 | * This function compares two SSIDs and checks if they match. | 163 | * This function compares two SSIDs and checks if they match. |
164 | */ | 164 | */ |
165 | s32 | 165 | s32 |
166 | mwifiex_ssid_cmp(struct mwifiex_802_11_ssid *ssid1, | 166 | mwifiex_ssid_cmp(struct cfg80211_ssid *ssid1, struct cfg80211_ssid *ssid2) |
167 | struct mwifiex_802_11_ssid *ssid2) | ||
168 | { | 167 | { |
169 | if (!ssid1 || !ssid2 || (ssid1->ssid_len != ssid2->ssid_len)) | 168 | if (!ssid1 || !ssid2 || (ssid1->ssid_len != ssid2->ssid_len)) |
170 | return -1; | 169 | return -1; |
@@ -1851,7 +1850,7 @@ mwifiex_queue_scan_cmd(struct mwifiex_private *priv, | |||
1851 | * firmware, filtered on a specific SSID. | 1850 | * firmware, filtered on a specific SSID. |
1852 | */ | 1851 | */ |
1853 | static int mwifiex_scan_specific_ssid(struct mwifiex_private *priv, | 1852 | static int mwifiex_scan_specific_ssid(struct mwifiex_private *priv, |
1854 | struct mwifiex_802_11_ssid *req_ssid) | 1853 | struct cfg80211_ssid *req_ssid) |
1855 | { | 1854 | { |
1856 | struct mwifiex_adapter *adapter = priv->adapter; | 1855 | struct mwifiex_adapter *adapter = priv->adapter; |
1857 | int ret = 0; | 1856 | int ret = 0; |
@@ -1896,7 +1895,7 @@ static int mwifiex_scan_specific_ssid(struct mwifiex_private *priv, | |||
1896 | * scan, depending upon whether an SSID is provided or not. | 1895 | * scan, depending upon whether an SSID is provided or not. |
1897 | */ | 1896 | */ |
1898 | int mwifiex_request_scan(struct mwifiex_private *priv, | 1897 | int mwifiex_request_scan(struct mwifiex_private *priv, |
1899 | struct mwifiex_802_11_ssid *req_ssid) | 1898 | struct cfg80211_ssid *req_ssid) |
1900 | { | 1899 | { |
1901 | int ret; | 1900 | int ret; |
1902 | 1901 | ||