Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

iwlagn: move iwl_free_pages to iwl-shared.h

Browse source 
This helper is used by the transport and the upper layer.
Kill __iwl_free_pages which was used in the transport only.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Emmanuel Grumbach 2011-08-25 23:11:05 -07:00 committed by John W. Linville
parent 845a9c0d8a
commit 790428b655
6 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/net/wireless/iwlwifi/iwl-dev.h
View file

@ -1505,13 +1505,4 @@ static inline int is_channel_ibss(const struct iwl_channel_info *ch)
return ((ch->flags & EEPROM_CHANNEL_IBSS)) ? 1 : 0;
}
static inline void __iwl_free_pages(struct iwl_priv *priv, struct page *page)
{
__free_pages(page, hw_params(priv).rx_page_order);
}
static inline void iwl_free_pages(struct iwl_priv *priv, unsigned long page)
{
free_pages(page, hw_params(priv).rx_page_order);
}
#endif /* __iwl_dev_h__ */

2
drivers/net/wireless/iwlwifi/iwl-scan.c
View file

@ -91,7 +91,7 @@ static int iwl_send_scan_abort(struct iwl_priv *priv)
ret = -EIO;
}
iwl_free_pages(priv, cmd.reply_page);
iwl_free_pages(priv->shrd, cmd.reply_page);
return ret;
}

5
drivers/net/wireless/iwlwifi/iwl-shared.h
View file

@ -229,6 +229,11 @@ static inline u32 iwl_get_debug_level(struct iwl_shared *shrd)
}
#endif
static inline void iwl_free_pages(struct iwl_shared *shrd, unsigned long page)
{
free_pages(page, shrd->hw_params.rx_page_order);
}
struct iwl_rx_mem_buffer {
dma_addr_t page_dma;
struct page *page;

4
drivers/net/wireless/iwlwifi/iwl-sta.c
View file

@ -177,7 +177,7 @@ int iwl_send_add_sta(struct iwl_priv *priv,
pkt = (struct iwl_rx_packet *)cmd.reply_page;
ret = iwl_process_add_sta_resp(priv, sta, pkt, true);
}
iwl_free_pages(priv, cmd.reply_page);
iwl_free_pages(priv->shrd, cmd.reply_page);
return ret;
}
@ -455,7 +455,7 @@ static int iwl_send_remove_station(struct iwl_priv *priv,
break;
}
}
iwl_free_pages(priv, cmd.reply_page);
iwl_free_pages(priv->shrd, cmd.reply_page);
return ret;
}

2
drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
View file

@ -1023,7 +1023,7 @@ static int iwl_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
}
fail:
if (cmd->reply_page) {
iwl_free_pages(priv, cmd->reply_page);
iwl_free_pages(priv->shrd, cmd->reply_page);
cmd->reply_page = 0;
}

3
drivers/net/wireless/iwlwifi/iwl-trans.c
View file

@ -129,7 +129,8 @@ static void iwl_trans_rxq_free_rx_bufs(struct iwl_trans *trans)
dma_unmap_page(bus(trans)->dev, rxq->pool[i].page_dma,
PAGE_SIZE << hw_params(trans).rx_page_order,
DMA_FROM_DEVICE);
__iwl_free_pages(priv(trans), rxq->pool[i].page);
__free_pages(rxq->pool[i].page,
hw_params(trans).rx_page_order);
rxq->pool[i].page = NULL;
}
list_add_tail(&rxq->pool[i].list, &rxq->rx_used);