libertas: convert KEY_MATERIAL to a direct command

The struct enc_key probably wants to die too, but that can come later.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Acked-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

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,
 
         if (test_bit(ASSOC_FLAG_WPA_UCAST_KEY, &assoc_req->flags)) {
                 clear_bit(ASSOC_FLAG_WPA_MCAST_KEY, &assoc_req->flags);
-                ret = lbs_prepare_and_send_command(priv,
-                                        CMD_802_11_KEY_MATERIAL,
-                                        CMD_ACT_SET,
-                                        CMD_OPTION_WAITFORRSP,
-                                        0, assoc_req);
+                ret = lbs_cmd_802_11_key_material(priv, CMD_ACT_SET, assoc_req);
                 assoc_req->flags = flags;
         }
 
@@ -363,11 +359,7 @@ static int assoc_helper_wpa_keys(struct lbs_private *priv,
         if (test_bit(ASSOC_FLAG_WPA_MCAST_KEY, &assoc_req->flags)) {
                 clear_bit(ASSOC_FLAG_WPA_UCAST_KEY, &assoc_req->flags);
 
-                ret = lbs_prepare_and_send_command(priv,
-                                        CMD_802_11_KEY_MATERIAL,
-                                        CMD_ACT_SET,
-                                        CMD_OPTION_WAITFORRSP,
-                                        0, assoc_req);
+                ret = lbs_cmd_802_11_key_material(priv, CMD_ACT_SET, assoc_req);
                 assoc_req->flags = flags;
         }