diff options
Diffstat (limited to 'drivers/net/wireless/libertas/assoc.c')
| -rw-r--r-- | drivers/net/wireless/libertas/assoc.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c index 75f6191e718d..7fe37bedf313 100644 --- a/drivers/net/wireless/libertas/assoc.c +++ b/drivers/net/wireless/libertas/assoc.c | |||
| @@ -349,11 +349,7 @@ static int assoc_helper_wpa_keys(struct lbs_private *priv, | |||
| 349 | 349 | ||
| 350 | if (test_bit(ASSOC_FLAG_WPA_UCAST_KEY, &assoc_req->flags)) { | 350 | if (test_bit(ASSOC_FLAG_WPA_UCAST_KEY, &assoc_req->flags)) { |
| 351 | clear_bit(ASSOC_FLAG_WPA_MCAST_KEY, &assoc_req->flags); | 351 | clear_bit(ASSOC_FLAG_WPA_MCAST_KEY, &assoc_req->flags); |
| 352 | ret = lbs_prepare_and_send_command(priv, | 352 | ret = lbs_cmd_802_11_key_material(priv, CMD_ACT_SET, assoc_req); |
| 353 | CMD_802_11_KEY_MATERIAL, | ||
| 354 | CMD_ACT_SET, | ||
| 355 | CMD_OPTION_WAITFORRSP, | ||
| 356 | 0, assoc_req); | ||
| 357 | assoc_req->flags = flags; | 353 | assoc_req->flags = flags; |
| 358 | } | 354 | } |
| 359 | 355 | ||
| @@ -363,11 +359,7 @@ static int assoc_helper_wpa_keys(struct lbs_private *priv, | |||
| 363 | if (test_bit(ASSOC_FLAG_WPA_MCAST_KEY, &assoc_req->flags)) { | 359 | if (test_bit(ASSOC_FLAG_WPA_MCAST_KEY, &assoc_req->flags)) { |
| 364 | clear_bit(ASSOC_FLAG_WPA_UCAST_KEY, &assoc_req->flags); | 360 | clear_bit(ASSOC_FLAG_WPA_UCAST_KEY, &assoc_req->flags); |
| 365 | 361 | ||
| 366 | ret = lbs_prepare_and_send_command(priv, | 362 | ret = lbs_cmd_802_11_key_material(priv, CMD_ACT_SET, assoc_req); |
| 367 | CMD_802_11_KEY_MATERIAL, | ||
| 368 | CMD_ACT_SET, | ||
| 369 | CMD_OPTION_WAITFORRSP, | ||
| 370 | 0, assoc_req); | ||
| 371 | assoc_req->flags = flags; | 363 | assoc_req->flags = flags; |
| 372 | } | 364 | } |
| 373 | 365 | ||