libertas: convert CMD_802_11_AUTHENTICATE to a direct command

And fix up setting authentication suite for v9+ firmware too.

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 1 insertions, 6 deletions

diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index ed079c1a34e6..bd740fc00f94 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -1220,8 +1220,7 @@ static void lbs_submit_command(struct lbs_private *priv,
         command = le16_to_cpu(cmd->command);
 
         /* These commands take longer */
-        if (command == CMD_802_11_SCAN || command == CMD_802_11_ASSOCIATE ||
-            command == CMD_802_11_AUTHENTICATE)
+        if (command == CMD_802_11_SCAN || command == CMD_802_11_ASSOCIATE)
                 timeo = 5 * HZ;
 
         lbs_deb_cmd("DNLD_CMD: command 0x%04x, seq %d, size %d\n",
@@ -1420,10 +1419,6 @@ int lbs_prepare_and_send_command(struct lbs_private *priv,
                 ret = lbs_cmd_80211_associate(priv, cmdptr, pdata_buf);
                 break;
 
-        case CMD_802_11_AUTHENTICATE:
-                ret = lbs_cmd_80211_authenticate(priv, cmdptr, pdata_buf);
-                break;
-
         case CMD_MAC_REG_ACCESS:
         case CMD_BBP_REG_ACCESS:
         case CMD_RF_REG_ACCESS: