diff options
Diffstat (limited to 'drivers/net/wireless/mwifiex/pcie.c')
-rw-r--r-- | drivers/net/wireless/mwifiex/pcie.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/wireless/mwifiex/pcie.c b/drivers/net/wireless/mwifiex/pcie.c index a5828da59365..4b463c3b9906 100644 --- a/drivers/net/wireless/mwifiex/pcie.c +++ b/drivers/net/wireless/mwifiex/pcie.c | |||
@@ -203,7 +203,7 @@ static int mwifiex_pcie_probe(struct pci_dev *pdev, | |||
203 | card->pcie.reg = data->reg; | 203 | card->pcie.reg = data->reg; |
204 | card->pcie.blksz_fw_dl = data->blksz_fw_dl; | 204 | card->pcie.blksz_fw_dl = data->blksz_fw_dl; |
205 | card->pcie.tx_buf_size = data->tx_buf_size; | 205 | card->pcie.tx_buf_size = data->tx_buf_size; |
206 | card->pcie.supports_fw_dump = data->supports_fw_dump; | 206 | card->pcie.can_dump_fw = data->can_dump_fw; |
207 | card->pcie.can_ext_scan = data->can_ext_scan; | 207 | card->pcie.can_ext_scan = data->can_ext_scan; |
208 | } | 208 | } |
209 | 209 | ||
@@ -498,7 +498,8 @@ static int mwifiex_init_rxq_ring(struct mwifiex_adapter *adapter) | |||
498 | 498 | ||
499 | for (i = 0; i < MWIFIEX_MAX_TXRX_BD; i++) { | 499 | for (i = 0; i < MWIFIEX_MAX_TXRX_BD; i++) { |
500 | /* Allocate skb here so that firmware can DMA data from it */ | 500 | /* Allocate skb here so that firmware can DMA data from it */ |
501 | skb = dev_alloc_skb(MWIFIEX_RX_DATA_BUF_SIZE); | 501 | skb = mwifiex_alloc_rx_buf(MWIFIEX_RX_DATA_BUF_SIZE, |
502 | GFP_KERNEL | GFP_DMA); | ||
502 | if (!skb) { | 503 | if (!skb) { |
503 | dev_err(adapter->dev, | 504 | dev_err(adapter->dev, |
504 | "Unable to allocate skb for RX ring.\n"); | 505 | "Unable to allocate skb for RX ring.\n"); |
@@ -1297,7 +1298,8 @@ static int mwifiex_pcie_process_recv_data(struct mwifiex_adapter *adapter) | |||
1297 | } | 1298 | } |
1298 | } | 1299 | } |
1299 | 1300 | ||
1300 | skb_tmp = dev_alloc_skb(MWIFIEX_RX_DATA_BUF_SIZE); | 1301 | skb_tmp = mwifiex_alloc_rx_buf(MWIFIEX_RX_DATA_BUF_SIZE, |
1302 | GFP_KERNEL | GFP_DMA); | ||
1301 | if (!skb_tmp) { | 1303 | if (!skb_tmp) { |
1302 | dev_err(adapter->dev, | 1304 | dev_err(adapter->dev, |
1303 | "Unable to allocate skb.\n"); | 1305 | "Unable to allocate skb.\n"); |
@@ -2271,7 +2273,7 @@ static void mwifiex_pcie_fw_dump_work(struct mwifiex_adapter *adapter) | |||
2271 | int ret; | 2273 | int ret; |
2272 | static char *env[] = { "DRIVER=mwifiex_pcie", "EVENT=fw_dump", NULL }; | 2274 | static char *env[] = { "DRIVER=mwifiex_pcie", "EVENT=fw_dump", NULL }; |
2273 | 2275 | ||
2274 | if (!card->pcie.supports_fw_dump) | 2276 | if (!card->pcie.can_dump_fw) |
2275 | return; | 2277 | return; |
2276 | 2278 | ||
2277 | for (idx = 0; idx < ARRAY_SIZE(mem_type_mapping_tbl); idx++) { | 2279 | for (idx = 0; idx < ARRAY_SIZE(mem_type_mapping_tbl); idx++) { |