Skip to content

L
linux
Commit b73bb5f1 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka
Browse files
Options

iwlegacy: s/il_rx_mem_buffer/il_rx_buf/ 

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
parent 7c2cde2e
Show whitespace changes
Inline Side-by-side
Showing with 62 additions and 62 deletions
drivers/net/wireless/iwlegacy/iwl-3945.c
View file @ b73bb5f1
...@@ -302,7 +302,7 @@ static void il3945_tx_queue_reclaim(struct il_priv *il, ...@@ -302,7 +302,7 @@ static void il3945_tx_queue_reclaim(struct il_priv *il,
* il3945_rx_reply_tx - Handle Tx response * il3945_rx_reply_tx - Handle Tx response
*/ */
static void il3945_rx_reply_tx(struct il_priv *il, static void il3945_rx_reply_tx(struct il_priv *il,
struct il_rx_mem_buffer *rxb) struct il_rx_buf *rxb)
{ {
struct il_rx_pkt *pkt = rxb_addr(rxb); struct il_rx_pkt *pkt = rxb_addr(rxb);
u16 sequence = le16_to_cpu(pkt->hdr.sequence); u16 sequence = le16_to_cpu(pkt->hdr.sequence);
...@@ -396,7 +396,7 @@ static void il3945_accumulative_statistics(struct il_priv *il, ...@@ -396,7 +396,7 @@ static void il3945_accumulative_statistics(struct il_priv *il,
#endif #endif
void il3945_hw_rx_statistics(struct il_priv *il, void il3945_hw_rx_statistics(struct il_priv *il,
struct il_rx_mem_buffer *rxb) struct il_rx_buf *rxb)
{ {
struct il_rx_pkt *pkt = rxb_addr(rxb); struct il_rx_pkt *pkt = rxb_addr(rxb);
...@@ -411,7 +411,7 @@ void il3945_hw_rx_statistics(struct il_priv *il, ...@@ -411,7 +411,7 @@ void il3945_hw_rx_statistics(struct il_priv *il,
} }
void il3945_reply_statistics(struct il_priv *il, void il3945_reply_statistics(struct il_priv *il,
struct il_rx_mem_buffer *rxb) struct il_rx_buf *rxb)
{ {
struct il_rx_pkt *pkt = rxb_addr(rxb); struct il_rx_pkt *pkt = rxb_addr(rxb);
__le32 *flag = (__le32 *)&pkt->u.raw; __le32 *flag = (__le32 *)&pkt->u.raw;
...@@ -456,7 +456,7 @@ static int il3945_is_network_packet(struct il_priv *il, ...@@ -456,7 +456,7 @@ static int il3945_is_network_packet(struct il_priv *il,
} }
static void il3945_pass_packet_to_mac80211(struct il_priv *il, static void il3945_pass_packet_to_mac80211(struct il_priv *il,
struct il_rx_mem_buffer *rxb, struct il_rx_buf *rxb,
struct ieee80211_rx_status *stats) struct ieee80211_rx_status *stats)
{ {
struct il_rx_pkt *pkt = rxb_addr(rxb); struct il_rx_pkt *pkt = rxb_addr(rxb);
...@@ -506,7 +506,7 @@ static void il3945_pass_packet_to_mac80211(struct il_priv *il, ...@@ -506,7 +506,7 @@ static void il3945_pass_packet_to_mac80211(struct il_priv *il,
#define IL_DELAY_NEXT_SCAN_AFTER_ASSOC (HZ*6) #define IL_DELAY_NEXT_SCAN_AFTER_ASSOC (HZ*6)
static void il3945_rx_reply_rx(struct il_priv *il, static void il3945_rx_reply_rx(struct il_priv *il,
struct il_rx_mem_buffer *rxb) struct il_rx_buf *rxb)
{ {
struct ieee80211_hdr *header; struct ieee80211_hdr *header;
struct ieee80211_rx_status rx_status; struct ieee80211_rx_status rx_status;
......
drivers/net/wireless/iwlegacy/iwl-3945.h
View file @ b73bb5f1
...@@ -259,9 +259,9 @@ void il3945_hw_build_tx_cmd_rate(struct il_priv *il, ...@@ -259,9 +259,9 @@ void il3945_hw_build_tx_cmd_rate(struct il_priv *il,
extern int il3945_hw_reg_send_txpower(struct il_priv *il); extern int il3945_hw_reg_send_txpower(struct il_priv *il);
extern int il3945_hw_reg_set_txpower(struct il_priv *il, s8 power); extern int il3945_hw_reg_set_txpower(struct il_priv *il, s8 power);
extern void il3945_hw_rx_statistics(struct il_priv *il, extern void il3945_hw_rx_statistics(struct il_priv *il,
struct il_rx_mem_buffer *rxb); struct il_rx_buf *rxb);
void il3945_reply_statistics(struct il_priv *il, void il3945_reply_statistics(struct il_priv *il,
struct il_rx_mem_buffer *rxb); struct il_rx_buf *rxb);
extern void il3945_disable_events(struct il_priv *il); extern void il3945_disable_events(struct il_priv *il);
extern int il4965_get_temperature(const struct il_priv *il); extern int il4965_get_temperature(const struct il_priv *il);
extern void il3945_post_associate(struct il_priv *il); extern void il3945_post_associate(struct il_priv *il);
......
drivers/net/wireless/iwlegacy/iwl-4965-lib.c
View file @ b73bb5f1
...@@ -230,7 +230,7 @@ void il4965_rx_queue_restock(struct il_priv *il) ...@@ -230,7 +230,7 @@ void il4965_rx_queue_restock(struct il_priv *il)
{ {
struct il_rx_queue *rxq = &il->rxq; struct il_rx_queue *rxq = &il->rxq;
struct list_head *element; struct list_head *element;
struct il_rx_mem_buffer *rxb; struct il_rx_buf *rxb;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&rxq->lock, flags); spin_lock_irqsave(&rxq->lock, flags);
...@@ -241,7 +241,7 @@ void il4965_rx_queue_restock(struct il_priv *il) ...@@ -241,7 +241,7 @@ void il4965_rx_queue_restock(struct il_priv *il)
/* Get next free Rx buffer, remove from free list */ /* Get next free Rx buffer, remove from free list */
element = rxq->rx_free.next; element = rxq->rx_free.next;
rxb = list_entry(element, struct il_rx_mem_buffer, list); rxb = list_entry(element, struct il_rx_buf, list);
list_del(element); list_del(element);
/* Point to Rx buffer via next RBD in circular buffer */ /* Point to Rx buffer via next RBD in circular buffer */
...@@ -280,7 +280,7 @@ static void il4965_rx_allocate(struct il_priv *il, gfp_t priority) ...@@ -280,7 +280,7 @@ static void il4965_rx_allocate(struct il_priv *il, gfp_t priority)
{ {
struct il_rx_queue *rxq = &il->rxq; struct il_rx_queue *rxq = &il->rxq;
struct list_head *element; struct list_head *element;
struct il_rx_mem_buffer *rxb; struct il_rx_buf *rxb;
struct page *page; struct page *page;
unsigned long flags; unsigned long flags;
gfp_t gfp_mask = priority; gfp_t gfp_mask = priority;
...@@ -329,7 +329,7 @@ static void il4965_rx_allocate(struct il_priv *il, gfp_t priority) ...@@ -329,7 +329,7 @@ static void il4965_rx_allocate(struct il_priv *il, gfp_t priority)
return; return;
} }
element = rxq->rx_used.next; element = rxq->rx_used.next;
rxb = list_entry(element, struct il_rx_mem_buffer, list); rxb = list_entry(element, struct il_rx_buf, list);
list_del(element); list_del(element);
spin_unlock_irqrestore(&rxq->lock, flags); spin_unlock_irqrestore(&rxq->lock, flags);
...@@ -529,7 +529,7 @@ static void il4965_pass_packet_to_mac80211(struct il_priv *il, ...@@ -529,7 +529,7 @@ static void il4965_pass_packet_to_mac80211(struct il_priv *il,
struct ieee80211_hdr *hdr, struct ieee80211_hdr *hdr,
u16 len, u16 len,
u32 ampdu_status, u32 ampdu_status,
struct il_rx_mem_buffer *rxb, struct il_rx_buf *rxb,
struct ieee80211_rx_status *stats) struct ieee80211_rx_status *stats)
{ {
struct sk_buff *skb; struct sk_buff *skb;
...@@ -566,7 +566,7 @@ static void il4965_pass_packet_to_mac80211(struct il_priv *il, ...@@ -566,7 +566,7 @@ static void il4965_pass_packet_to_mac80211(struct il_priv *il,
/* Called for REPLY_RX (legacy ABG frames), or /* Called for REPLY_RX (legacy ABG frames), or
* REPLY_RX_MPDU_CMD (HT high-throughput N frames). */ * REPLY_RX_MPDU_CMD (HT high-throughput N frames). */
void il4965_rx_reply_rx(struct il_priv *il, void il4965_rx_reply_rx(struct il_priv *il,
struct il_rx_mem_buffer *rxb) struct il_rx_buf *rxb)
{ {
struct ieee80211_hdr *header; struct ieee80211_hdr *header;
struct ieee80211_rx_status rx_status; struct ieee80211_rx_status rx_status;
...@@ -686,7 +686,7 @@ void il4965_rx_reply_rx(struct il_priv *il, ...@@ -686,7 +686,7 @@ void il4965_rx_reply_rx(struct il_priv *il,
/* Cache phy data (Rx signal strength, etc) for HT frame (REPLY_RX_PHY_CMD). /* Cache phy data (Rx signal strength, etc) for HT frame (REPLY_RX_PHY_CMD).
* This will be used later in il_rx_reply_rx() for REPLY_RX_MPDU_CMD. */ * This will be used later in il_rx_reply_rx() for REPLY_RX_MPDU_CMD. */
void il4965_rx_reply_rx_phy(struct il_priv *il, void il4965_rx_reply_rx_phy(struct il_priv *il,
struct il_rx_mem_buffer *rxb) struct il_rx_buf *rxb)
{ {
struct il_rx_pkt *pkt = rxb_addr(rxb); struct il_rx_pkt *pkt = rxb_addr(rxb);
il->_4965.last_phy_res_valid = true; il->_4965.last_phy_res_valid = true;
......
drivers/net/wireless/iwlegacy/iwl-4965-rx.c
View file @ b73bb5f1
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
#include "iwl-4965.h" #include "iwl-4965.h"
void il4965_rx_missed_beacon_notif(struct il_priv *il, void il4965_rx_missed_beacon_notif(struct il_priv *il,
struct il_rx_mem_buffer *rxb) struct il_rx_buf *rxb)
{ {
struct il_rx_pkt *pkt = rxb_addr(rxb); struct il_rx_pkt *pkt = rxb_addr(rxb);
...@@ -152,7 +152,7 @@ static void il4965_accumulative_statistics(struct il_priv *il, ...@@ -152,7 +152,7 @@ static void il4965_accumulative_statistics(struct il_priv *il,
#define REG_RECALIB_PERIOD (60) #define REG_RECALIB_PERIOD (60)
void il4965_rx_statistics(struct il_priv *il, void il4965_rx_statistics(struct il_priv *il,
struct il_rx_mem_buffer *rxb) struct il_rx_buf *rxb)
{ {
int change; int change;
struct il_rx_pkt *pkt = rxb_addr(rxb); struct il_rx_pkt *pkt = rxb_addr(rxb);
...@@ -196,7 +196,7 @@ void il4965_rx_statistics(struct il_priv *il, ...@@ -196,7 +196,7 @@ void il4965_rx_statistics(struct il_priv *il,
} }
void il4965_reply_statistics(struct il_priv *il, void il4965_reply_statistics(struct il_priv *il,
struct il_rx_mem_buffer *rxb) struct il_rx_buf *rxb)
{ {
struct il_rx_pkt *pkt = rxb_addr(rxb); struct il_rx_pkt *pkt = rxb_addr(rxb);
......
drivers/net/wireless/iwlegacy/iwl-4965-tx.c
View file @ b73bb5f1
...@@ -1246,7 +1246,7 @@ void il4965_hwrate_to_tx_control(struct il_priv *il, u32 rate_n_flags, ...@@ -1246,7 +1246,7 @@ void il4965_hwrate_to_tx_control(struct il_priv *il, u32 rate_n_flags,
* of frames sent via aggregation. * of frames sent via aggregation.
*/ */
void il4965_rx_reply_compressed_ba(struct il_priv *il, void il4965_rx_reply_compressed_ba(struct il_priv *il,
struct il_rx_mem_buffer *rxb) struct il_rx_buf *rxb)
{ {
struct il_rx_pkt *pkt = rxb_addr(rxb); struct il_rx_pkt *pkt = rxb_addr(rxb);
struct il_compressed_ba_resp *ba_resp = &pkt->u.compressed_ba; struct il_compressed_ba_resp *ba_resp = &pkt->u.compressed_ba;
......
drivers/net/wireless/iwlegacy/iwl-4965.c
View file @ b73bb5f1
...@@ -1772,7 +1772,7 @@ static int il4965_get_ra_sta_id(struct il_priv *il, struct ieee80211_hdr *hdr) ...@@ -1772,7 +1772,7 @@ static int il4965_get_ra_sta_id(struct il_priv *il, struct ieee80211_hdr *hdr)
* il4965_rx_reply_tx - Handle standard (non-aggregation) Tx response * il4965_rx_reply_tx - Handle standard (non-aggregation) Tx response
*/ */
static void il4965_rx_reply_tx(struct il_priv *il, static void il4965_rx_reply_tx(struct il_priv *il,
struct il_rx_mem_buffer *rxb) struct il_rx_buf *rxb)
{ {
struct il_rx_pkt *pkt = rxb_addr(rxb); struct il_rx_pkt *pkt = rxb_addr(rxb);
u16 sequence = le16_to_cpu(pkt->hdr.sequence); u16 sequence = le16_to_cpu(pkt->hdr.sequence);
...@@ -1875,7 +1875,7 @@ static void il4965_rx_reply_tx(struct il_priv *il, ...@@ -1875,7 +1875,7 @@ static void il4965_rx_reply_tx(struct il_priv *il,
} }
static void il4965_rx_beacon_notif(struct il_priv *il, static void il4965_rx_beacon_notif(struct il_priv *il,
struct il_rx_mem_buffer *rxb) struct il_rx_buf *rxb)
{ {
struct il_rx_pkt *pkt = rxb_addr(rxb); struct il_rx_pkt *pkt = rxb_addr(rxb);
struct il4965_beacon_notif *beacon = (void *)pkt->u.raw; struct il4965_beacon_notif *beacon = (void *)pkt->u.raw;
......
drivers/net/wireless/iwlegacy/iwl-4965.h
View file @ b73bb5f1
...@@ -100,9 +100,9 @@ void il4965_rx_queue_free(struct il_priv *il, struct il_rx_queue *rxq); ...@@ -100,9 +100,9 @@ void il4965_rx_queue_free(struct il_priv *il, struct il_rx_queue *rxq);
int il4965_rxq_stop(struct il_priv *il); int il4965_rxq_stop(struct il_priv *il);
int il4965_hwrate_to_mac80211_idx(u32 rate_n_flags, enum ieee80211_band band); int il4965_hwrate_to_mac80211_idx(u32 rate_n_flags, enum ieee80211_band band);
void il4965_rx_reply_rx(struct il_priv *il, void il4965_rx_reply_rx(struct il_priv *il,
struct il_rx_mem_buffer *rxb); struct il_rx_buf *rxb);
void il4965_rx_reply_rx_phy(struct il_priv *il, void il4965_rx_reply_rx_phy(struct il_priv *il,
struct il_rx_mem_buffer *rxb); struct il_rx_buf *rxb);
void il4965_rx_handle(struct il_priv *il); void il4965_rx_handle(struct il_priv *il);
/* tx */ /* tx */
...@@ -122,7 +122,7 @@ int il4965_tx_agg_stop(struct il_priv *il, struct ieee80211_vif *vif, ...@@ -122,7 +122,7 @@ int il4965_tx_agg_stop(struct il_priv *il, struct ieee80211_vif *vif,
int il4965_txq_check_empty(struct il_priv *il, int il4965_txq_check_empty(struct il_priv *il,
int sta_id, u8 tid, int txq_id); int sta_id, u8 tid, int txq_id);
void il4965_rx_reply_compressed_ba(struct il_priv *il, void il4965_rx_reply_compressed_ba(struct il_priv *il,
struct il_rx_mem_buffer *rxb); struct il_rx_buf *rxb);
int il4965_tx_queue_reclaim(struct il_priv *il, int txq_id, int index); int il4965_tx_queue_reclaim(struct il_priv *il, int txq_id, int index);
void il4965_hw_txq_ctx_free(struct il_priv *il); void il4965_hw_txq_ctx_free(struct il_priv *il);
int il4965_txq_ctx_alloc(struct il_priv *il); int il4965_txq_ctx_alloc(struct il_priv *il);
...@@ -171,13 +171,13 @@ u8 il4965_toggle_tx_ant(struct il_priv *il, u8 ant_idx, u8 valid); ...@@ -171,13 +171,13 @@ u8 il4965_toggle_tx_ant(struct il_priv *il, u8 ant_idx, u8 valid);
/* rx */ /* rx */
void il4965_rx_missed_beacon_notif(struct il_priv *il, void il4965_rx_missed_beacon_notif(struct il_priv *il,
struct il_rx_mem_buffer *rxb); struct il_rx_buf *rxb);
bool il4965_good_plcp_health(struct il_priv *il, bool il4965_good_plcp_health(struct il_priv *il,
struct il_rx_pkt *pkt); struct il_rx_pkt *pkt);
void il4965_rx_statistics(struct il_priv *il, void il4965_rx_statistics(struct il_priv *il,
struct il_rx_mem_buffer *rxb); struct il_rx_buf *rxb);
void il4965_reply_statistics(struct il_priv *il, void il4965_reply_statistics(struct il_priv *il,
struct il_rx_mem_buffer *rxb); struct il_rx_buf *rxb);
/* scan */ /* scan */
int il4965_request_scan(struct il_priv *il, struct ieee80211_vif *vif); int il4965_request_scan(struct il_priv *il, struct ieee80211_vif *vif);
......
drivers/net/wireless/iwlegacy/iwl-core.c
View file @ b73bb5f1
...@@ -863,7 +863,7 @@ void il_chswitch_done(struct il_priv *il, bool is_success) ...@@ -863,7 +863,7 @@ void il_chswitch_done(struct il_priv *il, bool is_success)
} }
EXPORT_SYMBOL(il_chswitch_done); EXPORT_SYMBOL(il_chswitch_done);
void il_rx_csa(struct il_priv *il, struct il_rx_mem_buffer *rxb) void il_rx_csa(struct il_priv *il, struct il_rx_buf *rxb)
{ {
struct il_rx_pkt *pkt = rxb_addr(rxb); struct il_rx_pkt *pkt = rxb_addr(rxb);
struct il_csa_notification *csa = &(pkt->u.csa_notif); struct il_csa_notification *csa = &(pkt->u.csa_notif);
...@@ -1206,7 +1206,7 @@ int il_send_statistics_request(struct il_priv *il, u8 flags, bool clear) ...@@ -1206,7 +1206,7 @@ int il_send_statistics_request(struct il_priv *il, u8 flags, bool clear)
EXPORT_SYMBOL(il_send_statistics_request); EXPORT_SYMBOL(il_send_statistics_request);
void il_rx_pm_sleep_notif(struct il_priv *il, void il_rx_pm_sleep_notif(struct il_priv *il,
struct il_rx_mem_buffer *rxb) struct il_rx_buf *rxb)
{ {
#ifdef CONFIG_IWLEGACY_DEBUG #ifdef CONFIG_IWLEGACY_DEBUG
struct il_rx_pkt *pkt = rxb_addr(rxb); struct il_rx_pkt *pkt = rxb_addr(rxb);
...@@ -1218,7 +1218,7 @@ void il_rx_pm_sleep_notif(struct il_priv *il, ...@@ -1218,7 +1218,7 @@ void il_rx_pm_sleep_notif(struct il_priv *il,
EXPORT_SYMBOL(il_rx_pm_sleep_notif); EXPORT_SYMBOL(il_rx_pm_sleep_notif);
void il_rx_pm_debug_statistics_notif(struct il_priv *il, void il_rx_pm_debug_statistics_notif(struct il_priv *il,
struct il_rx_mem_buffer *rxb) struct il_rx_buf *rxb)
{ {
struct il_rx_pkt *pkt = rxb_addr(rxb); struct il_rx_pkt *pkt = rxb_addr(rxb);
u32 len = le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK; u32 len = le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK;
...@@ -1230,7 +1230,7 @@ void il_rx_pm_debug_statistics_notif(struct il_priv *il, ...@@ -1230,7 +1230,7 @@ void il_rx_pm_debug_statistics_notif(struct il_priv *il,
EXPORT_SYMBOL(il_rx_pm_debug_statistics_notif); EXPORT_SYMBOL(il_rx_pm_debug_statistics_notif);
void il_rx_reply_error(struct il_priv *il, void il_rx_reply_error(struct il_priv *il,
struct il_rx_mem_buffer *rxb) struct il_rx_buf *rxb)
{ {
struct il_rx_pkt *pkt = rxb_addr(rxb); struct il_rx_pkt *pkt = rxb_addr(rxb);
......
drivers/net/wireless/iwlegacy/iwl-core.h
View file @ b73bb5f1
...@@ -370,11 +370,11 @@ static inline void il_update_stats(struct il_priv *il, bool is_tx, ...@@ -370,11 +370,11 @@ static inline void il_update_stats(struct il_priv *il, bool is_tx,
* RX handlers. * RX handlers.
* **************************************************/ * **************************************************/
void il_rx_pm_sleep_notif(struct il_priv *il, void il_rx_pm_sleep_notif(struct il_priv *il,
struct il_rx_mem_buffer *rxb); struct il_rx_buf *rxb);
void il_rx_pm_debug_statistics_notif(struct il_priv *il, void il_rx_pm_debug_statistics_notif(struct il_priv *il,
struct il_rx_mem_buffer *rxb); struct il_rx_buf *rxb);
void il_rx_reply_error(struct il_priv *il, void il_rx_reply_error(struct il_priv *il,
struct il_rx_mem_buffer *rxb); struct il_rx_buf *rxb);
/***************************************************** /*****************************************************
* RX * RX
...@@ -386,14 +386,14 @@ void il_rx_queue_update_write_ptr(struct il_priv *il, ...@@ -386,14 +386,14 @@ void il_rx_queue_update_write_ptr(struct il_priv *il,
struct il_rx_queue *q); struct il_rx_queue *q);
int il_rx_queue_space(const struct il_rx_queue *q); int il_rx_queue_space(const struct il_rx_queue *q);
void il_tx_cmd_complete(struct il_priv *il, void il_tx_cmd_complete(struct il_priv *il,
struct il_rx_mem_buffer *rxb); struct il_rx_buf *rxb);
/* Handlers */ /* Handlers */
void il_rx_spectrum_measure_notif(struct il_priv *il, void il_rx_spectrum_measure_notif(struct il_priv *il,
struct il_rx_mem_buffer *rxb); struct il_rx_buf *rxb);
void il_recover_from_statistics(struct il_priv *il, void il_recover_from_statistics(struct il_priv *il,
struct il_rx_pkt *pkt); struct il_rx_pkt *pkt);
void il_chswitch_done(struct il_priv *il, bool is_success); void il_chswitch_done(struct il_priv *il, bool is_success);
void il_rx_csa(struct il_priv *il, struct il_rx_mem_buffer *rxb); void il_rx_csa(struct il_priv *il, struct il_rx_buf *rxb);
/* TX helpers */ /* TX helpers */
......
drivers/net/wireless/iwlegacy/iwl-dev.h
View file @ b73bb5f1
...@@ -85,7 +85,7 @@ struct il_tx_queue; ...@@ -85,7 +85,7 @@ struct il_tx_queue;
#define DEFAULT_SHORT_RETRY_LIMIT 7U #define DEFAULT_SHORT_RETRY_LIMIT 7U
#define DEFAULT_LONG_RETRY_LIMIT 4U #define DEFAULT_LONG_RETRY_LIMIT 4U
struct il_rx_mem_buffer { struct il_rx_buf {
dma_addr_t page_dma; dma_addr_t page_dma;
struct page *page; struct page *page;
struct list_head list; struct list_head list;
...@@ -346,13 +346,13 @@ struct il_host_cmd { ...@@ -346,13 +346,13 @@ struct il_host_cmd {
* @rb_stts: driver's pointer to receive buffer status * @rb_stts: driver's pointer to receive buffer status
* @rb_stts_dma: bus address of receive buffer status * @rb_stts_dma: bus address of receive buffer status
* *
* NOTE: rx_free and rx_used are used as a FIFO for il_rx_mem_buffers * NOTE: rx_free and rx_used are used as a FIFO for il_rx_bufs
*/ */
struct il_rx_queue { struct il_rx_queue {
__le32 *bd; __le32 *bd;
dma_addr_t bd_dma; dma_addr_t bd_dma;
struct il_rx_mem_buffer pool[RX_QUEUE_SIZE + RX_FREE_BUFFERS]; struct il_rx_buf pool[RX_QUEUE_SIZE + RX_FREE_BUFFERS];
struct il_rx_mem_buffer *queue[RX_QUEUE_SIZE]; struct il_rx_buf *queue[RX_QUEUE_SIZE];
u32 read; u32 read;
u32 write; u32 write;
u32 free_count; u32 free_count;
...@@ -968,7 +968,7 @@ struct il_priv { ...@@ -968,7 +968,7 @@ struct il_priv {
int alloc_rxb_page; int alloc_rxb_page;
void (*rx_handlers[REPLY_MAX])(struct il_priv *il, void (*rx_handlers[REPLY_MAX])(struct il_priv *il,
struct il_rx_mem_buffer *rxb); struct il_rx_buf *rxb);
struct ieee80211_supported_band bands[IEEE80211_NUM_BANDS]; struct ieee80211_supported_band bands[IEEE80211_NUM_BANDS];
......
drivers/net/wireless/iwlegacy/iwl-rx.c
View file @ b73bb5f1
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
* are available, schedules il_rx_replenish * are available, schedules il_rx_replenish
* *
* -- enable interrupts -- * -- enable interrupts --
* ISR - il_rx() Detach il_rx_mem_buffers from pool up to the * ISR - il_rx() Detach il_rx_bufs from pool up to the
* READ INDEX, detaching the SKB from the pool. * READ INDEX, detaching the SKB from the pool.
* Moves the packet buffer from queue to rx_used. * Moves the packet buffer from queue to rx_used.
* Calls il_rx_queue_restock to refill any empty * Calls il_rx_queue_restock to refill any empty
...@@ -211,7 +211,7 @@ EXPORT_SYMBOL(il_rx_queue_alloc); ...@@ -211,7 +211,7 @@ EXPORT_SYMBOL(il_rx_queue_alloc);
void il_rx_spectrum_measure_notif(struct il_priv *il, void il_rx_spectrum_measure_notif(struct il_priv *il,
struct il_rx_mem_buffer *rxb) struct il_rx_buf *rxb)
{ {
struct il_rx_pkt *pkt = rxb_addr(rxb); struct il_rx_pkt *pkt = rxb_addr(rxb);
struct il_spectrum_notification *report = &(pkt->u.spectrum_notif); struct il_spectrum_notification *report = &(pkt->u.spectrum_notif);
......
drivers/net/wireless/iwlegacy/iwl-scan.c
View file @ b73bb5f1
...@@ -183,7 +183,7 @@ EXPORT_SYMBOL(il_scan_cancel_timeout); ...@@ -183,7 +183,7 @@ EXPORT_SYMBOL(il_scan_cancel_timeout);
/* Service response to REPLY_SCAN_CMD (0x80) */ /* Service response to REPLY_SCAN_CMD (0x80) */
static void il_rx_reply_scan(struct il_priv *il, static void il_rx_reply_scan(struct il_priv *il,
struct il_rx_mem_buffer *rxb) struct il_rx_buf *rxb)
{ {
#ifdef CONFIG_IWLEGACY_DEBUG #ifdef CONFIG_IWLEGACY_DEBUG
struct il_rx_pkt *pkt = rxb_addr(rxb); struct il_rx_pkt *pkt = rxb_addr(rxb);
...@@ -196,7 +196,7 @@ static void il_rx_reply_scan(struct il_priv *il, ...@@ -196,7 +196,7 @@ static void il_rx_reply_scan(struct il_priv *il,
/* Service SCAN_START_NOTIFICATION (0x82) */ /* Service SCAN_START_NOTIFICATION (0x82) */
static void il_rx_scan_start_notif(struct il_priv *il, static void il_rx_scan_start_notif(struct il_priv *il,
struct il_rx_mem_buffer *rxb) struct il_rx_buf *rxb)
{ {
struct il_rx_pkt *pkt = rxb_addr(rxb); struct il_rx_pkt *pkt = rxb_addr(rxb);
struct il_scanstart_notification *notif = struct il_scanstart_notification *notif =
...@@ -214,7 +214,7 @@ static void il_rx_scan_start_notif(struct il_priv *il, ...@@ -214,7 +214,7 @@ static void il_rx_scan_start_notif(struct il_priv *il,
/* Service SCAN_RESULTS_NOTIFICATION (0x83) */ /* Service SCAN_RESULTS_NOTIFICATION (0x83) */
static void il_rx_scan_results_notif(struct il_priv *il, static void il_rx_scan_results_notif(struct il_priv *il,
struct il_rx_mem_buffer *rxb) struct il_rx_buf *rxb)
{ {
#ifdef CONFIG_IWLEGACY_DEBUG #ifdef CONFIG_IWLEGACY_DEBUG
struct il_rx_pkt *pkt = rxb_addr(rxb); struct il_rx_pkt *pkt = rxb_addr(rxb);
...@@ -236,7 +236,7 @@ static void il_rx_scan_results_notif(struct il_priv *il, ...@@ -236,7 +236,7 @@ static void il_rx_scan_results_notif(struct il_priv *il,
/* Service SCAN_COMPLETE_NOTIFICATION (0x84) */ /* Service SCAN_COMPLETE_NOTIFICATION (0x84) */
static void il_rx_scan_complete_notif(struct il_priv *il, static void il_rx_scan_complete_notif(struct il_priv *il,
struct il_rx_mem_buffer *rxb) struct il_rx_buf *rxb)
{ {
#ifdef CONFIG_IWLEGACY_DEBUG #ifdef CONFIG_IWLEGACY_DEBUG
......
drivers/net/wireless/iwlegacy/iwl-tx.c
View file @ b73bb5f1
...@@ -593,7 +593,7 @@ static void il_hcmd_queue_reclaim(struct il_priv *il, int txq_id, ...@@ -593,7 +593,7 @@ static void il_hcmd_queue_reclaim(struct il_priv *il, int txq_id,
* if the callback returns 1 * if the callback returns 1
*/ */
void void
il_tx_cmd_complete(struct il_priv *il, struct il_rx_mem_buffer *rxb) il_tx_cmd_complete(struct il_priv *il, struct il_rx_buf *rxb)
{ {
struct il_rx_pkt *pkt = rxb_addr(rxb); struct il_rx_pkt *pkt = rxb_addr(rxb);
u16 sequence = le16_to_cpu(pkt->hdr.sequence); u16 sequence = le16_to_cpu(pkt->hdr.sequence);
......
drivers/net/wireless/iwlegacy/iwl3945-base.c
View file @ b73bb5f1
...@@ -745,7 +745,7 @@ static int il3945_get_measurement(struct il_priv *il, ...@@ -745,7 +745,7 @@ static int il3945_get_measurement(struct il_priv *il,
} }
static void il3945_rx_reply_alive(struct il_priv *il, static void il3945_rx_reply_alive(struct il_priv *il,
struct il_rx_mem_buffer *rxb) struct il_rx_buf *rxb)
{ {
struct il_rx_pkt *pkt = rxb_addr(rxb); struct il_rx_pkt *pkt = rxb_addr(rxb);
struct il_alive_resp *palive; struct il_alive_resp *palive;
...@@ -781,7 +781,7 @@ static void il3945_rx_reply_alive(struct il_priv *il, ...@@ -781,7 +781,7 @@ static void il3945_rx_reply_alive(struct il_priv *il,
} }
static void il3945_rx_reply_add_sta(struct il_priv *il, static void il3945_rx_reply_add_sta(struct il_priv *il,
struct il_rx_mem_buffer *rxb) struct il_rx_buf *rxb)
{ {
#ifdef CONFIG_IWLEGACY_DEBUG #ifdef CONFIG_IWLEGACY_DEBUG
struct il_rx_pkt *pkt = rxb_addr(rxb); struct il_rx_pkt *pkt = rxb_addr(rxb);
...@@ -791,7 +791,7 @@ static void il3945_rx_reply_add_sta(struct il_priv *il, ...@@ -791,7 +791,7 @@ static void il3945_rx_reply_add_sta(struct il_priv *il,
} }
static void il3945_rx_beacon_notif(struct il_priv *il, static void il3945_rx_beacon_notif(struct il_priv *il,
struct il_rx_mem_buffer *rxb) struct il_rx_buf *rxb)
{ {
struct il_rx_pkt *pkt = rxb_addr(rxb); struct il_rx_pkt *pkt = rxb_addr(rxb);
struct il3945_beacon_notif *beacon = &(pkt->u.beacon_status); struct il3945_beacon_notif *beacon = &(pkt->u.beacon_status);
...@@ -814,7 +814,7 @@ static void il3945_rx_beacon_notif(struct il_priv *il, ...@@ -814,7 +814,7 @@ static void il3945_rx_beacon_notif(struct il_priv *il,
/* Handle notification from uCode that card's power state is changing /* Handle notification from uCode that card's power state is changing
* due to software, hardware, or critical temperature RFKILL */ * due to software, hardware, or critical temperature RFKILL */
static void il3945_rx_card_state_notif(struct il_priv *il, static void il3945_rx_card_state_notif(struct il_priv *il,
struct il_rx_mem_buffer *rxb) struct il_rx_buf *rxb)
{ {
struct il_rx_pkt *pkt = rxb_addr(rxb); struct il_rx_pkt *pkt = rxb_addr(rxb);
u32 flags = le32_to_cpu(pkt->u.card_state_notif.flags); u32 flags = le32_to_cpu(pkt->u.card_state_notif.flags);
...@@ -935,7 +935,7 @@ static void il3945_setup_rx_handlers(struct il_priv *il) ...@@ -935,7 +935,7 @@ static void il3945_setup_rx_handlers(struct il_priv *il)
* are available, schedules il3945_rx_replenish * are available, schedules il3945_rx_replenish
* *
* -- enable interrupts -- * -- enable interrupts --
* ISR - il3945_rx() Detach il_rx_mem_buffers from pool up to the * ISR - il3945_rx() Detach il_rx_bufs from pool up to the
* READ INDEX, detaching the SKB from the pool. * READ INDEX, detaching the SKB from the pool.
* Moves the packet buffer from queue to rx_used. * Moves the packet buffer from queue to rx_used.
* Calls il3945_rx_queue_restock to refill any empty * Calls il3945_rx_queue_restock to refill any empty
...@@ -968,7 +968,7 @@ static void il3945_rx_queue_restock(struct il_priv *il) ...@@ -968,7 +968,7 @@ static void il3945_rx_queue_restock(struct il_priv *il)
{ {
struct il_rx_queue *rxq = &il->rxq; struct il_rx_queue *rxq = &il->rxq;
struct list_head *element; struct list_head *element;
struct il_rx_mem_buffer *rxb; struct il_rx_buf *rxb;
unsigned long flags; unsigned long flags;
int write; int write;
...@@ -977,7 +977,7 @@ static void il3945_rx_queue_restock(struct il_priv *il) ...@@ -977,7 +977,7 @@ static void il3945_rx_queue_restock(struct il_priv *il)
while (il_rx_queue_space(rxq) > 0 && rxq->free_count) { while (il_rx_queue_space(rxq) > 0 && rxq->free_count) {
/* Get next free Rx buffer, remove from free list */ /* Get next free Rx buffer, remove from free list */
element = rxq->rx_free.next; element = rxq->rx_free.next;
rxb = list_entry(element, struct il_rx_mem_buffer, list); rxb = list_entry(element, struct il_rx_buf, list);
list_del(element); list_del(element);
/* Point to Rx buffer via next RBD in circular buffer */ /* Point to Rx buffer via next RBD in circular buffer */
...@@ -1016,7 +1016,7 @@ static void il3945_rx_allocate(struct il_priv *il, gfp_t priority) ...@@ -1016,7 +1016,7 @@ static void il3945_rx_allocate(struct il_priv *il, gfp_t priority)
{ {
struct il_rx_queue *rxq = &il->rxq; struct il_rx_queue *rxq = &il->rxq;
struct list_head *element; struct list_head *element;
struct il_rx_mem_buffer *rxb; struct il_rx_buf *rxb;
struct page *page; struct page *page;
unsigned long flags; unsigned long flags;
gfp_t gfp_mask = priority; gfp_t gfp_mask = priority;
...@@ -1059,7 +1059,7 @@ static void il3945_rx_allocate(struct il_priv *il, gfp_t priority) ...@@ -1059,7 +1059,7 @@ static void il3945_rx_allocate(struct il_priv *il, gfp_t priority)
return; return;
} }
element = rxq->rx_used.next; element = rxq->rx_used.next;
rxb = list_entry(element, struct il_rx_mem_buffer, list); rxb = list_entry(element, struct il_rx_buf, list);
list_del(element); list_del(element);
spin_unlock_irqrestore(&rxq->lock, flags); spin_unlock_irqrestore(&rxq->lock, flags);
...@@ -1201,7 +1201,7 @@ int il3945_calc_db_from_ratio(int sig_ratio) ...@@ -1201,7 +1201,7 @@ int il3945_calc_db_from_ratio(int sig_ratio)
*/ */
static void il3945_rx_handle(struct il_priv *il) static void il3945_rx_handle(struct il_priv *il)
{ {
struct il_rx_mem_buffer *rxb; struct il_rx_buf *rxb;
struct il_rx_pkt *pkt; struct il_rx_pkt *pkt;
struct il_rx_queue *rxq = &il->rxq; struct il_rx_queue *rxq = &il->rxq;
u32 r, i; u32 r, i;
......
drivers/net/wireless/iwlegacy/iwl4965-base.c
View file @ b73bb5f1
...@@ -428,7 +428,7 @@ int il4965_hw_tx_queue_init(struct il_priv *il, ...@@ -428,7 +428,7 @@ int il4965_hw_tx_queue_init(struct il_priv *il,
* *
******************************************************************************/ ******************************************************************************/
static void il4965_rx_reply_alive(struct il_priv *il, static void il4965_rx_reply_alive(struct il_priv *il,
struct il_rx_mem_buffer *rxb) struct il_rx_buf *rxb)
{ {
struct il_rx_pkt *pkt = rxb_addr(rxb); struct il_rx_pkt *pkt = rxb_addr(rxb);
struct il_alive_resp *palive; struct il_alive_resp *palive;
...@@ -488,7 +488,7 @@ static void il4965_bg_statistics_periodic(unsigned long data) ...@@ -488,7 +488,7 @@ static void il4965_bg_statistics_periodic(unsigned long data)
} }
static void il4965_rx_beacon_notif(struct il_priv *il, static void il4965_rx_beacon_notif(struct il_priv *il,
struct il_rx_mem_buffer *rxb) struct il_rx_buf *rxb)
{ {
struct il_rx_pkt *pkt = rxb_addr(rxb); struct il_rx_pkt *pkt = rxb_addr(rxb);
struct il4965_beacon_notif *beacon = struct il4965_beacon_notif *beacon =
...@@ -530,7 +530,7 @@ static void il4965_perform_ct_kill_task(struct il_priv *il) ...@@ -530,7 +530,7 @@ static void il4965_perform_ct_kill_task(struct il_priv *il)
/* Handle notification from uCode that card's power state is changing /* Handle notification from uCode that card's power state is changing
* due to software, hardware, or critical temperature RFKILL */ * due to software, hardware, or critical temperature RFKILL */
static void il4965_rx_card_state_notif(struct il_priv *il, static void il4965_rx_card_state_notif(struct il_priv *il,
struct il_rx_mem_buffer *rxb) struct il_rx_buf *rxb)
{ {
struct il_rx_pkt *pkt = rxb_addr(rxb); struct il_rx_pkt *pkt = rxb_addr(rxb);
u32 flags = le32_to_cpu(pkt->u.card_state_notif.flags); u32 flags = le32_to_cpu(pkt->u.card_state_notif.flags);
...@@ -633,7 +633,7 @@ static void il4965_setup_rx_handlers(struct il_priv *il) ...@@ -633,7 +633,7 @@ static void il4965_setup_rx_handlers(struct il_priv *il)
*/ */
void il4965_rx_handle(struct il_priv *il) void il4965_rx_handle(struct il_priv *il)
{ {
struct il_rx_mem_buffer *rxb; struct il_rx_buf *rxb;
struct il_rx_pkt *pkt; struct il_rx_pkt *pkt;
struct il_rx_queue *rxq = &il->rxq; struct il_rx_queue *rxq = &il->rxq;
u32 r, i; u32 r, i;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7