Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.26

1 files changed, 13 insertions, 53 deletions

diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c
index 63aa884b18f2..888f92d8afc9 100644
--- a/drivers/net/wireless/libertas/cmdresp.c
+++ b/drivers/net/wireless/libertas/cmdresp.c
@@ -146,22 +146,6 @@ static int lbs_ret_reg_access(struct lbs_private *priv,
         return ret;
 }
 
-static int lbs_ret_802_11_stat(struct lbs_private *priv,
-                                struct cmd_ds_command *resp)
-{
-        lbs_deb_enter(LBS_DEB_CMD);
-/*      currently priv->wlan802_11Stat is unused
-
-        struct cmd_ds_802_11_get_stat *p11Stat = &resp->params.gstat;
-
-        // TODO Convert it to Big endian befor copy
-        memcpy(&priv->wlan802_11Stat,
-               p11Stat, sizeof(struct cmd_ds_802_11_get_stat));
-*/
-        lbs_deb_leave(LBS_DEB_CMD);
-        return 0;
-}
-
 static int lbs_ret_802_11_snmp_mib(struct lbs_private *priv,
                                     struct cmd_ds_command *resp)
 {
@@ -303,20 +287,6 @@ static int lbs_ret_802_11_eeprom_access(struct lbs_private *priv,
         return 0;
 }
 
-static int lbs_ret_get_log(struct lbs_private *priv,
-                            struct cmd_ds_command *resp)
-{
-        struct cmd_ds_802_11_get_log *logmessage = &resp->params.glog;
-
-        lbs_deb_enter(LBS_DEB_CMD);
-
-        /* Stored little-endian */
-        memcpy(&priv->logmsg, logmessage, sizeof(struct cmd_ds_802_11_get_log));
-
-        lbs_deb_leave(LBS_DEB_CMD);
-        return 0;
-}
-
 static int lbs_ret_802_11_bcn_ctrl(struct lbs_private * priv,
                                         struct cmd_ds_command *resp)
 {
@@ -335,7 +305,6 @@ static int lbs_ret_802_11_bcn_ctrl(struct lbs_private * priv,
 }
 
 static inline int handle_cmd_response(struct lbs_private *priv,
-                                      unsigned long dummy,
                                       struct cmd_header *cmd_response)
 {
         struct cmd_ds_command *resp = (struct cmd_ds_command *) cmd_response;
@@ -352,10 +321,6 @@ static inline int handle_cmd_response(struct lbs_private *priv,
                 ret = lbs_ret_reg_access(priv, respcmd, resp);
                 break;
 
-        case CMD_RET(CMD_802_11_GET_LOG):
-                ret = lbs_ret_get_log(priv, resp);
-                break;
-
         case CMD_RET_802_11_ASSOCIATE:
         case CMD_RET(CMD_802_11_ASSOCIATE):
         case CMD_RET(CMD_802_11_REASSOCIATE):
@@ -364,7 +329,7 @@ static inline int handle_cmd_response(struct lbs_private *priv,
 
         case CMD_RET(CMD_802_11_DISASSOCIATE):
         case CMD_RET(CMD_802_11_DEAUTHENTICATE):
-                ret = lbs_ret_80211_disassociate(priv, resp);
+                ret = lbs_ret_80211_disassociate(priv);
                 break;
 
         case CMD_RET(CMD_802_11_AD_HOC_START):
@@ -372,10 +337,6 @@ static inline int handle_cmd_response(struct lbs_private *priv,
                 ret = lbs_ret_80211_ad_hoc_start(priv, resp);
                 break;
 
-        case CMD_RET(CMD_802_11_GET_STAT):
-                ret = lbs_ret_802_11_stat(priv, resp);
-                break;
-
         case CMD_RET(CMD_802_11_SNMP_MIB):
                 ret = lbs_ret_802_11_snmp_mib(priv, resp);
                 break;
@@ -394,7 +355,6 @@ static inline int handle_cmd_response(struct lbs_private *priv,
                 break;
 
         case CMD_RET(CMD_MAC_MULTICAST_ADR):
-        case CMD_RET(CMD_MAC_CONTROL):
         case CMD_RET(CMD_802_11_RESET):
         case CMD_RET(CMD_802_11_AUTHENTICATE):
         case CMD_RET(CMD_802_11_BEACON_STOP):
@@ -413,7 +373,7 @@ static inline int handle_cmd_response(struct lbs_private *priv,
                 break;
 
         case CMD_RET(CMD_802_11_AD_HOC_STOP):
-                ret = lbs_ret_80211_ad_hoc_stop(priv, resp);
+                ret = lbs_ret_80211_ad_hoc_stop(priv);
                 break;
 
         case CMD_RET(CMD_802_11_EEPROM_ACCESS):
@@ -421,7 +381,7 @@ static inline int handle_cmd_response(struct lbs_private *priv,
                 break;
 
         case CMD_RET(CMD_802_11D_DOMAIN_INFO):
-                ret = lbs_ret_802_11d_domain_info(priv, resp);
+                ret = lbs_ret_802_11d_domain_info(resp);
                 break;
 
         case CMD_RET(CMD_802_11_TPC_CFG):
@@ -624,7 +584,7 @@ int lbs_process_rx_command(struct lbs_private *priv)
                 ret = priv->cur_cmd->callback(priv, priv->cur_cmd->callback_arg,
                                 resp);
         } else
-                ret = handle_cmd_response(priv, 0, resp);
+                ret = handle_cmd_response(priv, resp);
 
         spin_lock_irqsave(&priv->driver_lock, flags);
 
@@ -675,11 +635,9 @@ int lbs_process_event(struct lbs_private *priv)
         eventcause = priv->eventcause >> SBI_EVENT_CAUSE_SHIFT;
         spin_unlock_irq(&priv->driver_lock);
 
-        lbs_deb_cmd("event cause %d\n", eventcause);
-
         switch (eventcause) {
         case MACREG_INT_CODE_LINK_SENSED:
-                lbs_deb_cmd("EVENT: MACREG_INT_CODE_LINK_SENSED\n");
+                lbs_deb_cmd("EVENT: link sensed\n");
                 break;
 
         case MACREG_INT_CODE_DEAUTHENTICATED:
@@ -698,7 +656,7 @@ int lbs_process_event(struct lbs_private *priv)
                 break;
 
         case MACREG_INT_CODE_PS_SLEEP:
-                lbs_deb_cmd("EVENT: sleep\n");
+                lbs_deb_cmd("EVENT: ps sleep\n");
 
                 /* handle unexpected PS SLEEP event */
                 if (priv->psstate == PS_STATE_FULL_POWER) {
@@ -708,17 +666,17 @@ int lbs_process_event(struct lbs_private *priv)
                 }
                 priv->psstate = PS_STATE_PRE_SLEEP;
 
-                lbs_ps_confirm_sleep(priv, (u16) priv->psmode);
+                lbs_ps_confirm_sleep(priv);
 
                 break;
 
         case MACREG_INT_CODE_HOST_AWAKE:
-                lbs_deb_cmd("EVENT: HOST_AWAKE\n");
+                lbs_deb_cmd("EVENT: host awake\n");
                 lbs_send_confirmwake(priv);
                 break;
 
         case MACREG_INT_CODE_PS_AWAKE:
-                lbs_deb_cmd("EVENT: awake\n");
+                lbs_deb_cmd("EVENT: ps awake\n");
                 /* handle unexpected PS AWAKE event */
                 if (priv->psstate == PS_STATE_FULL_POWER) {
                         lbs_deb_cmd(
@@ -749,14 +707,16 @@ int lbs_process_event(struct lbs_private *priv)
                 lbs_deb_cmd("EVENT: MULTICAST MIC ERROR\n");
                 handle_mic_failureevent(priv, MACREG_INT_CODE_MIC_ERR_MULTICAST);
                 break;
+
         case MACREG_INT_CODE_MIB_CHANGED:
+                lbs_deb_cmd("EVENT: MIB CHANGED\n");
+                break;
         case MACREG_INT_CODE_INIT_DONE:
+                lbs_deb_cmd("EVENT: INIT DONE\n");
                 break;
-
         case MACREG_INT_CODE_ADHOC_BCN_LOST:
                 lbs_deb_cmd("EVENT: ADHOC beacon lost\n");
                 break;
-
         case MACREG_INT_CODE_RSSI_LOW:
                 lbs_pr_alert("EVENT: rssi low\n");
                 break;