aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/libertas/assoc.c8
-rw-r--r--drivers/net/wireless/libertas/cmd.c9
-rw-r--r--drivers/net/wireless/libertas/decl.h2
3 files changed, 7 insertions, 12 deletions
diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c
index 54161f1e742a..fcea2a124a56 100644
--- a/drivers/net/wireless/libertas/assoc.c
+++ b/drivers/net/wireless/libertas/assoc.c
@@ -272,9 +272,7 @@ static int assoc_helper_wep_keys(struct lbs_private *priv,
272 else 272 else
273 priv->mac_control &= ~CMD_ACT_MAC_WEP_ENABLE; 273 priv->mac_control &= ~CMD_ACT_MAC_WEP_ENABLE;
274 274
275 ret = lbs_set_mac_control(priv); 275 lbs_set_mac_control(priv);
276 if (ret)
277 goto out;
278 276
279 mutex_lock(&priv->lock); 277 mutex_lock(&priv->lock);
280 278
@@ -304,9 +302,7 @@ static int assoc_helper_secinfo(struct lbs_private *priv,
304 memcpy(&priv->secinfo, &assoc_req->secinfo, 302 memcpy(&priv->secinfo, &assoc_req->secinfo,
305 sizeof(struct lbs_802_11_security)); 303 sizeof(struct lbs_802_11_security));
306 304
307 ret = lbs_set_mac_control(priv); 305 lbs_set_mac_control(priv);
308 if (ret)
309 goto out;
310 306
311 /* If RSN is already enabled, don't try to enable it again, since 307 /* If RSN is already enabled, don't try to enable it again, since
312 * ENABLE_RSN resets internal state machines and will clobber the 308 * ENABLE_RSN resets internal state machines and will clobber the
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index be461c5c42ae..be8a170b633f 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -1326,9 +1326,8 @@ int lbs_set_radio_control(struct lbs_private *priv)
1326 return ret; 1326 return ret;
1327} 1327}
1328 1328
1329int lbs_set_mac_control(struct lbs_private *priv) 1329void lbs_set_mac_control(struct lbs_private *priv)
1330{ 1330{
1331 int ret = 0;
1332 struct cmd_ds_mac_control cmd; 1331 struct cmd_ds_mac_control cmd;
1333 1332
1334 lbs_deb_enter(LBS_DEB_CMD); 1333 lbs_deb_enter(LBS_DEB_CMD);
@@ -1337,10 +1336,10 @@ int lbs_set_mac_control(struct lbs_private *priv)
1337 cmd.action = cpu_to_le16(priv->mac_control); 1336 cmd.action = cpu_to_le16(priv->mac_control);
1338 cmd.reserved = 0; 1337 cmd.reserved = 0;
1339 1338
1340 ret = lbs_cmd_with_response(priv, CMD_MAC_CONTROL, &cmd); 1339 lbs_cmd_async(priv, CMD_MAC_CONTROL,
1340 &cmd.hdr, sizeof(cmd));
1341 1341
1342 lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret); 1342 lbs_deb_leave(LBS_DEB_CMD);
1343 return ret;
1344} 1343}
1345 1344
1346/** 1345/**
diff --git a/drivers/net/wireless/libertas/decl.h b/drivers/net/wireless/libertas/decl.h
index f0de2a1e918f..989fb77e66dc 100644
--- a/drivers/net/wireless/libertas/decl.h
+++ b/drivers/net/wireless/libertas/decl.h
@@ -17,7 +17,7 @@ struct net_device;
17struct cmd_ctrl_node; 17struct cmd_ctrl_node;
18struct cmd_ds_command; 18struct cmd_ds_command;
19 19
20int lbs_set_mac_control(struct lbs_private *priv); 20void lbs_set_mac_control(struct lbs_private *priv);
21 21
22void lbs_send_tx_feedback(struct lbs_private *priv); 22void lbs_send_tx_feedback(struct lbs_private *priv);
23 23