Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62159944 authored by Avinash Patil's avatar Avinash Patil Committed by Kalle Valo
Browse files

mwifiex: rename alloc_rx_buf to alloc_dma_aligned_buf 



Rename this function to reflect its purpose correctly.

Signed-off-by: default avatarAvinash Patil <patila@marvell.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent a9adbcb3

drivers/net/wireless/mwifiex/main.h

+1 −1
Original line number Diff line number Diff line
@@ -1423,7 +1423,7 @@ u8 mwifiex_adjust_data_rate(struct mwifiex_private *priv, 
			    u8 rx_rate, u8 ht_info);



void mwifiex_dump_drv_info(struct mwifiex_adapter *adapter);

void *mwifiex_alloc_rx_buf(int rx_len, gfp_t flags);

void *mwifiex_alloc_dma_align_buf(int rx_len, gfp_t flags);



#ifdef CONFIG_DEBUG_FS

void mwifiex_debugfs_init(void);

drivers/net/wireless/mwifiex/pcie.c

+4 −4
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ static int mwifiex_init_rxq_ring(struct mwifiex_adapter *adapter) 


	for (i = 0; i < MWIFIEX_MAX_TXRX_BD; i++) {

		/* Allocate skb here so that firmware can DMA data from it */

		skb = mwifiex_alloc_rx_buf(MWIFIEX_RX_DATA_BUF_SIZE,

		skb = mwifiex_alloc_dma_align_buf(MWIFIEX_RX_DATA_BUF_SIZE,

						  GFP_KERNEL | GFP_DMA);

		if (!skb) {

			dev_err(adapter->dev,
@@ -1298,7 +1298,7 @@ static int mwifiex_pcie_process_recv_data(struct mwifiex_adapter *adapter) 
			}

		}



		skb_tmp = mwifiex_alloc_rx_buf(MWIFIEX_RX_DATA_BUF_SIZE,

		skb_tmp = mwifiex_alloc_dma_align_buf(MWIFIEX_RX_DATA_BUF_SIZE,

						      GFP_KERNEL | GFP_DMA);

		if (!skb_tmp) {

			dev_err(adapter->dev,

drivers/net/wireless/mwifiex/sdio.c

+4 −3
Original line number Diff line number Diff line
@@ -1362,7 +1362,7 @@ static int mwifiex_process_int_status(struct mwifiex_adapter *adapter) 
			return -1;

		rx_len = (u16) (rx_blocks * MWIFIEX_SDIO_BLOCK_SIZE);



		skb = mwifiex_alloc_rx_buf(rx_len, GFP_KERNEL | GFP_DMA);

		skb = mwifiex_alloc_dma_align_buf(rx_len, GFP_KERNEL | GFP_DMA);

		if (!skb)

			return -1;
@@ -1459,8 +1459,9 @@ static int mwifiex_process_int_status(struct mwifiex_adapter *adapter) 
			}

			rx_len = (u16) (rx_blocks * MWIFIEX_SDIO_BLOCK_SIZE);



			skb = mwifiex_alloc_rx_buf(rx_len,

						   GFP_KERNEL | GFP_DMA);

			skb = mwifiex_alloc_dma_align_buf(rx_len,

							  GFP_KERNEL |

							  GFP_DMA);



			if (!skb) {

				dev_err(adapter->dev, "%s: failed to alloc skb",

drivers/net/wireless/mwifiex/util.c

+2 −2
Original line number Diff line number Diff line
@@ -632,7 +632,7 @@ void mwifiex_hist_data_reset(struct mwifiex_private *priv) 
		atomic_set(&phist_data->sig_str[ix], 0);

}



void *mwifiex_alloc_rx_buf(int rx_len, gfp_t flags)

void *mwifiex_alloc_dma_align_buf(int rx_len, gfp_t flags)

{

	struct sk_buff *skb;

	int buf_len, pad;
@@ -653,4 +653,4 @@ void *mwifiex_alloc_rx_buf(int rx_len, gfp_t flags) 


	return skb;

}

EXPORT_SYMBOL_GPL(mwifiex_alloc_rx_buf);
 
EXPORT_SYMBOL_GPL(mwifiex_alloc_dma_align_buf);