rsi: sdio changes to support BT

Queue number is correctly updated for BT traffic. Also, kzalloc
instead of kmalloc is used for Rx packet allocation.

Signed-off-by: Prameela Rani Garnepudi <prameela.j04cs@gmail.com>
Signed-off-by: Amitkumar Karwar <amit.karwar@redpinesignals.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/rsi/rsi_91x_sdio.c b/drivers/net/wireless/rsi/rsi_91x_sdio.c
index 5722736..beb18d0 100644 (file)
--- a/drivers/net/wireless/rsi/rsi_91x_sdio.c
+++ b/drivers/net/wireless/rsi/rsi_91x_sdio.c
@@ -763,6 +763,8 @@ static int rsi_sdio_host_intf_write_pkt(struct rsi_hw *adapter,
        int status;
 
        queueno = ((pkt[1] >> 4) & 0xf);
+       if (queueno == RSI_BT_MGMT_Q || queueno == RSI_BT_DATA_Q)
+               queueno = RSI_BT_Q;
 
        num_blocks = len / block_size;
 

diff --git a/drivers/net/wireless/rsi/rsi_91x_sdio_ops.c b/drivers/net/wireless/rsi/rsi_91x_sdio_ops.c
index 169c981..6e74261 100644 (file)
--- a/drivers/net/wireless/rsi/rsi_91x_sdio_ops.c
+++ b/drivers/net/wireless/rsi/rsi_91x_sdio_ops.c
@@ -103,7 +103,7 @@ static int rsi_process_pkt(struct rsi_common *common)
 
        rcv_pkt_len = (num_blks * 256);
 
-       common->rx_data_pkt = kmalloc(rcv_pkt_len, GFP_KERNEL);
+       common->rx_data_pkt = kzalloc(rcv_pkt_len, GFP_KERNEL);
        if (!common->rx_data_pkt) {
                rsi_dbg(ERR_ZONE, "%s: Failed in memory allocation\n",
                        __func__);