aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwifiex/sta_ioctl.c
diff options
context:
space:
mode:
authorAmitkumar Karwar <akarwar@marvell.com>2012-02-28 01:04:14 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-03-05 15:23:13 -0500
commitb9be5f39bdabb25708a9de294c2cae7bdd8dfb17 (patch)
tree8cbf232af30ab2c5b433712a97a07b1ad6398f40 /drivers/net/wireless/mwifiex/sta_ioctl.c
parenteb416ad37db897efe9b2a5b79bd671f5966fa443 (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/sta_ioctl.c')
-rw-r--r--drivers/net/wireless/mwifiex/sta_ioctl.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/mwifiex/sta_ioctl.c b/drivers/net/wireless/mwifiex/sta_ioctl.c
index e10161f5894c..593d285111d2 100644
--- a/drivers/net/wireless/mwifiex/sta_ioctl.c
+++ b/drivers/net/wireless/mwifiex/sta_ioctl.c
@@ -192,7 +192,7 @@ int mwifiex_fill_new_bss_desc(struct mwifiex_private *priv,
192 * first. 192 * first.
193 */ 193 */
194int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss, 194int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss,
195 struct mwifiex_802_11_ssid *req_ssid) 195 struct cfg80211_ssid *req_ssid)
196{ 196{
197 int ret; 197 int ret;
198 struct mwifiex_adapter *adapter = priv->adapter; 198 struct mwifiex_adapter *adapter = priv->adapter;
@@ -464,8 +464,7 @@ int mwifiex_get_bss_info(struct mwifiex_private *priv,
464 464
465 info->bss_mode = priv->bss_mode; 465 info->bss_mode = priv->bss_mode;
466 466
467 memcpy(&info->ssid, &bss_desc->ssid, 467 memcpy(&info->ssid, &bss_desc->ssid, sizeof(struct cfg80211_ssid));
468 sizeof(struct mwifiex_802_11_ssid));
469 468
470 memcpy(&info->bssid, &bss_desc->mac_address, ETH_ALEN); 469 memcpy(&info->bssid, &bss_desc->mac_address, ETH_ALEN);
471 470