rsi: Changed the SDIO interrupt variables and some clean up.

Changed the SDIO interrupt variables and some clean ups.

Signed-off-by: Jahnavi Meher <jahnavi.meher@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/rsi/rsi_91x_sdio_ops.c b/drivers/net/wireless/rsi/rsi_91x_sdio_ops.c
index 20d11cc..4834a9a 100644 (file)
--- a/drivers/net/wireless/rsi/rsi_91x_sdio_ops.c
+++ b/drivers/net/wireless/rsi/rsi_91x_sdio_ops.c
@@ -401,14 +401,16 @@ void rsi_interrupt_handler(struct rsi_hw *adapter)
                        case BUFFER_AVAILABLE:
                                dev->rx_info.watch_bufferfull_count = 0;
                                dev->rx_info.buffer_full = false;
+                               dev->rx_info.semi_buffer_full = false;
                                dev->rx_info.mgmt_buffer_full = false;
                                rsi_sdio_ack_intr(common->priv,
                                                  (1 << PKT_BUFF_AVAILABLE));
-                               rsi_set_event((&common->tx_thread.event));
+                               rsi_set_event(&common->tx_thread.event);
+
                                rsi_dbg(ISR_ZONE,
-                                       "%s: ==> BUFFER_AVILABLE <==\n",
+                                       "%s: ==> BUFFER_AVAILABLE <==\n",
                                        __func__);
-                               dev->rx_info.buf_avilable_counter++;
+                               dev->rx_info.buf_available_counter++;
                                break;
 
                        case FIRMWARE_ASSERT_IND:

diff --git a/drivers/net/wireless/rsi/rsi_sdio.h b/drivers/net/wireless/rsi/rsi_sdio.h
index df4b5e2..c7e8f2b 100644 (file)
--- a/drivers/net/wireless/rsi/rsi_sdio.h
+++ b/drivers/net/wireless/rsi/rsi_sdio.h
@@ -30,7 +30,7 @@
 
 enum sdio_interrupt_type {
        BUFFER_FULL         = 0x0,
-       BUFFER_AVAILABLE    = 0x1,
+       BUFFER_AVAILABLE    = 0x2,
        FIRMWARE_ASSERT_IND = 0x3,
        MSDU_PACKET_PENDING = 0x4,
        UNKNOWN_INT         = 0XE
@@ -42,7 +42,7 @@ enum sdio_interrupt_type {
 #define PKT_MGMT_BUFF_FULL                      2
 #define MSDU_PKT_PENDING                        3
 /* Interrupt Bit Related Macros */
-#define PKT_BUFF_AVAILABLE                      0
+#define PKT_BUFF_AVAILABLE                      1
 #define FW_ASSERT_IND                           2
 
 #define RSI_DEVICE_BUFFER_STATUS_REGISTER       0xf3
@@ -84,7 +84,7 @@ enum sdio_interrupt_type {
 #define TA_HOLD_THREAD_VALUE         cpu_to_le32(0xF)
 #define TA_RELEASE_THREAD_VALUE      cpu_to_le32(0xF)
 #define TA_BASE_ADDR                 0x2200
-#define MISC_CFG_BASE_ADDR           0x4150
+#define MISC_CFG_BASE_ADDR           0x4105
 
 struct receive_info {
        bool buffer_full;
@@ -98,7 +98,7 @@ struct receive_info {
        u32 total_sdio_msdu_pending_intr;
        u32 total_sdio_unknown_intr;
        u32 buf_full_counter;
-       u32 buf_avilable_counter;
+       u32 buf_available_counter;
 };
 
 struct rsi_91x_sdiodev {