cfg80211: fix alignment problem in scan request

[GitHub/MotorolaMobilityLLC/kernel-slsi.git] / net / wireless / sme.c

diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index 104b33e34d22bc0f9a2e71b80d2300a148eb5857..8e2ef54ea714c076f42668f5d84259c9f56e28dd 100644 (file)
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -65,7 +65,6 @@ static int cfg80211_conn_scan(struct wireless_dev *wdev)
        if (!request)
                return -ENOMEM;
 
-       request->channels = (void *)((char *)request + sizeof(*request));
        if (wdev->conn->params.channel)
                request->channels[0] = wdev->conn->params.channel;
        else {
@@ -82,7 +81,7 @@ static int cfg80211_conn_scan(struct wireless_dev *wdev)
                }
        }
        request->n_channels = n_channels;
-       request->ssids = (void *)(request->channels + n_channels);
+       request->ssids = (void *)&request->channels[n_channels];
        request->n_ssids = 1;
 
        memcpy(request->ssids[0].ssid, wdev->conn->params.ssid,