staging: wilc1000: avoid extra buffer copy while connect cfg ops

Refactor the code to avoid the use of an extra buffer to store the
connection related parameter. No need to call cfg80211_disconnected in
case of failure to send the wid command to firmware, an error status is
directly returned in cfg80211 connect callback.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 783c99b79b6fa683d2ecdbac8572d5794c88db44..f50728c68e7503fa191de3aec904177a33321643 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -25,20 +25,6 @@ struct scan_attr {
        struct hidden_network hidden_network;
 };
 
-struct connect_attr {
-       u8 *bssid;
-       u8 *ssid;
-       size_t ssid_len;
-       u8 *ies;
-       size_t ies_len;
-       u8 security;
-       wilc_connect_result result;
-       void *arg;
-       enum authtype auth_type;
-       u8 ch;
-       void *params;
-};
-
 struct rcvd_async_info {
        u8 *buffer;
        u32 len;
@@ -99,7 +85,6 @@ struct wilc_gtk_key {
 
 union message_body {
        struct scan_attr scan_info;
-       struct connect_attr con_info;
        struct rcvd_net_info net_info;
        struct rcvd_async_info async_info;
        struct set_multicast multicast_info;
@@ -362,54 +347,15 @@ error:
        kfree(msg);
 }
 
-static int wilc_send_connect_wid(struct wilc_vif *vif,
-                                struct connect_attr *conn_attr)
+static int wilc_send_connect_wid(struct wilc_vif *vif)
 {
        int result = 0;
        struct wid wid_list[8];
        u32 wid_cnt = 0, dummyval = 0;
        u8 *cur_byte = NULL;
-       struct join_bss_param *bss_param = conn_attr->params;
        struct host_if_drv *hif_drv = vif->hif_drv;
-
-       if (conn_attr->bssid) {
-               hif_drv->usr_conn_req.bssid = kmemdup(conn_attr->bssid, 6,
-                                                     GFP_KERNEL);
-               if (!hif_drv->usr_conn_req.bssid) {
-                       result = -ENOMEM;
-                       goto error;
-               }
-       }
-
-       hif_drv->usr_conn_req.ssid_len = conn_attr->ssid_len;
-       if (conn_attr->ssid) {
-               hif_drv->usr_conn_req.ssid = kmalloc(conn_attr->ssid_len + 1,
-                                                    GFP_KERNEL);
-               if (!hif_drv->usr_conn_req.ssid) {
-                       result = -ENOMEM;
-                       goto error;
-               }
-               memcpy(hif_drv->usr_conn_req.ssid,
-                      conn_attr->ssid,
-                      conn_attr->ssid_len);
-               hif_drv->usr_conn_req.ssid[conn_attr->ssid_len] = '\0';
-       }
-
-       hif_drv->usr_conn_req.ies_len = conn_attr->ies_len;
-       if (conn_attr->ies) {
-               hif_drv->usr_conn_req.ies = kmemdup(conn_attr->ies,
-                                                   conn_attr->ies_len,
-                                                   GFP_KERNEL);
-               if (!hif_drv->usr_conn_req.ies) {
-                       result = -ENOMEM;
-                       goto error;
-               }
-       }
-
-       hif_drv->usr_conn_req.security = conn_attr->security;
-       hif_drv->usr_conn_req.auth_type = conn_attr->auth_type;
-       hif_drv->usr_conn_req.conn_result = conn_attr->result;
-       hif_drv->usr_conn_req.arg = conn_attr->arg;
+       struct user_conn_req *conn_attr = &hif_drv->usr_conn_req;
+       struct join_bss_param *bss_param = hif_drv->usr_conn_req.param;
 
        wid_list[wid_cnt].id = WID_SUCCESS_FRAME_COUNT;
        wid_list[wid_cnt].type = WID_INT;
@@ -431,20 +377,20 @@ static int wilc_send_connect_wid(struct wilc_vif *vif,
 
        wid_list[wid_cnt].id = WID_INFO_ELEMENT_ASSOCIATE;
        wid_list[wid_cnt].type = WID_BIN_DATA;
-       wid_list[wid_cnt].val = hif_drv->usr_conn_req.ies;
-       wid_list[wid_cnt].size = hif_drv->usr_conn_req.ies_len;
+       wid_list[wid_cnt].val = conn_attr->ies;
+       wid_list[wid_cnt].size = conn_attr->ies_len;
        wid_cnt++;
 
        wid_list[wid_cnt].id = WID_11I_MODE;
        wid_list[wid_cnt].type = WID_CHAR;
        wid_list[wid_cnt].size = sizeof(char);
-       wid_list[wid_cnt].val = (s8 *)&hif_drv->usr_conn_req.security;
+       wid_list[wid_cnt].val = (s8 *)&conn_attr->security;
        wid_cnt++;
 
        wid_list[wid_cnt].id = WID_AUTH_TYPE;
        wid_list[wid_cnt].type = WID_CHAR;
        wid_list[wid_cnt].size = sizeof(char);
-       wid_list[wid_cnt].val = (s8 *)&hif_drv->usr_conn_req.auth_type;
+       wid_list[wid_cnt].val = (s8 *)&conn_attr->auth_type;
        wid_cnt++;
 
        wid_list[wid_cnt].id = WID_JOIN_REQ_EXTENDED;
@@ -494,7 +440,7 @@ static int wilc_send_connect_wid(struct wilc_vif *vif,
        *(cur_byte++)  = bss_param->uapsd_cap;
 
        *(cur_byte++)  = bss_param->ht_capable;
-       hif_drv->usr_conn_req.ht_capable = bss_param->ht_capable;
+       conn_attr->ht_capable = bss_param->ht_capable;
 
        *(cur_byte++)  =  bss_param->rsn_found;
        *(cur_byte++)  =  bss_param->rsn_grp_policy;
@@ -547,45 +493,16 @@ static int wilc_send_connect_wid(struct wilc_vif *vif,
                                      wilc_get_vif_idx(vif));
        if (result) {
                netdev_err(vif->ndev, "failed to send config packet\n");
-               result = -EFAULT;
+               kfree(cur_byte);
                goto error;
        } else {
                hif_drv->hif_state = HOST_IF_WAITING_CONN_RESP;
        }
 
-error:
-       if (result) {
-               struct connect_info conn_info;
-
-               del_timer(&hif_drv->connect_timer);
-
-               memset(&conn_info, 0, sizeof(struct connect_info));
-
-               if (conn_attr->result) {
-                       if (conn_attr->bssid)
-                               memcpy(conn_info.bssid, conn_attr->bssid, 6);
-
-                       if (conn_attr->ies) {
-                               conn_info.req_ies_len = conn_attr->ies_len;
-                               conn_info.req_ies = kmalloc(conn_attr->ies_len,
-                                                           GFP_KERNEL);
-                               memcpy(conn_info.req_ies,
-                                      conn_attr->ies,
-                                      conn_attr->ies_len);
-                       }
-
-                       conn_attr->result(CONN_DISCONN_EVENT_CONN_RESP,
-                                         &conn_info,
-                                         WILC_MAC_STATUS_DISCONNECTED,
-                                         NULL, conn_attr->arg);
-                       hif_drv->hif_state = HOST_IF_IDLE;
-                       kfree(conn_info.req_ies);
-                       conn_info.req_ies = NULL;
+       kfree(cur_byte);
+       return 0;
 
-               } else {
-                       netdev_err(vif->ndev, "Connect callback is NULL\n");
-               }
-       }
+error:
 
        kfree(conn_attr->bssid);
        conn_attr->bssid = NULL;
@@ -596,9 +513,6 @@ error:
        kfree(conn_attr->ies);
        conn_attr->ies = NULL;
 
-       kfree(conn_attr);
-       kfree(cur_byte);
-
        return result;
 }
 
@@ -1909,7 +1823,7 @@ int wilc_set_join_req(struct wilc_vif *vif, u8 *bssid, const u8 *ssid,
 {
        int result;
        struct host_if_drv *hif_drv = vif->hif_drv;
-       struct connect_attr *con_info;
+       struct user_conn_req *con_info = &hif_drv->usr_conn_req;
 
        if (!hif_drv || !connect_result) {
                netdev_err(vif->ndev,
@@ -1928,23 +1842,17 @@ int wilc_set_join_req(struct wilc_vif *vif, u8 *bssid, const u8 *ssid,
                return -EBUSY;
        }
 
-       con_info = kzalloc(sizeof(*con_info), GFP_KERNEL);
-       if (!con_info)
-               return -ENOMEM;
-
        con_info->security = security;
        con_info->auth_type = auth_type;
        con_info->ch = channel;
-       con_info->result = connect_result;
+       con_info->conn_result = connect_result;
        con_info->arg = user_arg;
-       con_info->params = join_params;
+       con_info->param = join_params;
 
        if (bssid) {
                con_info->bssid = kmemdup(bssid, 6, GFP_KERNEL);
-               if (!con_info->bssid) {
-                       result = -ENOMEM;
-                       goto free_con_info;
-               }
+               if (!con_info->bssid)
+                       return -ENOMEM;
        }
 
        if (ssid) {
@@ -1984,9 +1892,6 @@ free_ssid:
 free_bssid:
        kfree(con_info->bssid);
 
-free_con_info:
-       kfree(con_info);
-
        return result;
 }
 

diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index ac4bdfe249160a9ca3cdbfa6c54a1e09929d7b89..9b396a79b1442b63a29b818200f457cf088e2c8f 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -191,7 +191,9 @@ struct user_conn_req {
        size_t ies_len;
        wilc_connect_result conn_result;
        bool ht_capable;
+       u8 ch;
        void *arg;
+       void *param;
 };
 
 struct remain_ch {

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 7cc985e9f70608556d5fd0abe008b38a00d5cc04..08d4461d3f01c506caf2607f8d2e35a798bf6c37 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -719,6 +719,8 @@ static int connect(struct wiphy *wiphy, struct net_device *dev,
 
                netdev_err(dev, "wilc_set_join_req(): Error\n");
                ret = -ENOENT;
+               if (!wfi_drv->p2p_connect)
+                       wlan_channel = INVALID_CHANNEL;
                wilc_wlan_set_bssid(dev, null_bssid, WILC_STATION_MODE);
                goto out_error;
        }