Commit b73bb5f1 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka
Browse files

iwlegacy: s/il_rx_mem_buffer/il_rx_buf/ 



Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
parent 7c2cde2e

drivers/net/wireless/iwlegacy/iwl-3945.c

+5 −5
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ static void il3945_tx_queue_reclaim(struct il_priv *il, 
 * il3945_rx_reply_tx - Handle Tx response

 */

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);

	u16 sequence = le16_to_cpu(pkt->hdr.sequence);
@@ -396,7 +396,7 @@ static void il3945_accumulative_statistics(struct il_priv *il, 
#endif



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);
@@ -411,7 +411,7 @@ void il3945_hw_rx_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);

	__le32 *flag = (__le32 *)&pkt->u.raw;
@@ -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,

				   struct il_rx_mem_buffer *rxb,

				   struct il_rx_buf *rxb,

				   struct ieee80211_rx_status *stats)

{

	struct il_rx_pkt *pkt = rxb_addr(rxb);
@@ -506,7 +506,7 @@ static void il3945_pass_packet_to_mac80211(struct il_priv *il, 
#define IL_DELAY_NEXT_SCAN_AFTER_ASSOC (HZ*6)



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_rx_status rx_status;

drivers/net/wireless/iwlegacy/iwl-3945.h

+2 −2
Original line number Diff line number Diff line
@@ -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_set_txpower(struct il_priv *il, s8 power);

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,

			      struct il_rx_mem_buffer *rxb);

			      struct il_rx_buf *rxb);

extern void il3945_disable_events(struct il_priv *il);

extern int il4965_get_temperature(const struct il_priv *il);

extern void il3945_post_associate(struct il_priv *il);

drivers/net/wireless/iwlegacy/iwl-4965-lib.c

+7 −7
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ void il4965_rx_queue_restock(struct il_priv *il) 
{

	struct il_rx_queue *rxq = &il->rxq;

	struct list_head *element;

	struct il_rx_mem_buffer *rxb;

	struct il_rx_buf *rxb;

	unsigned long flags;



	spin_lock_irqsave(&rxq->lock, flags);
@@ -241,7 +241,7 @@ void il4965_rx_queue_restock(struct il_priv *il) 


		/* Get next free Rx buffer, remove from free list */

		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);



		/* 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) 
{

	struct il_rx_queue *rxq = &il->rxq;

	struct list_head *element;

	struct il_rx_mem_buffer *rxb;

	struct il_rx_buf *rxb;

	struct page *page;

	unsigned long flags;

	gfp_t gfp_mask = priority;
@@ -329,7 +329,7 @@ static void il4965_rx_allocate(struct il_priv *il, gfp_t priority) 
			return;

		}

		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);



		spin_unlock_irqrestore(&rxq->lock, flags);
@@ -529,7 +529,7 @@ static void il4965_pass_packet_to_mac80211(struct il_priv *il, 
					struct ieee80211_hdr *hdr,

					u16 len,

					u32 ampdu_status,

					struct il_rx_mem_buffer *rxb,

					struct il_rx_buf *rxb,

					struct ieee80211_rx_status *stats)

{

	struct sk_buff *skb;
@@ -566,7 +566,7 @@ static void il4965_pass_packet_to_mac80211(struct il_priv *il, 
/* Called for REPLY_RX (legacy ABG frames), or

 * REPLY_RX_MPDU_CMD (HT high-throughput N frames). */

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_rx_status rx_status;
@@ -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).

 * 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,

			    struct il_rx_mem_buffer *rxb)

			    struct il_rx_buf *rxb)

{

	struct il_rx_pkt *pkt = rxb_addr(rxb);

	il->_4965.last_phy_res_valid = true;

drivers/net/wireless/iwlegacy/iwl-4965-rx.c

+3 −3
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
#include "iwl-4965.h"



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);
@@ -152,7 +152,7 @@ static void il4965_accumulative_statistics(struct il_priv *il, 
#define REG_RECALIB_PERIOD (60)



void il4965_rx_statistics(struct il_priv *il,

			      struct il_rx_mem_buffer *rxb)

			      struct il_rx_buf *rxb)

{

	int change;

	struct il_rx_pkt *pkt = rxb_addr(rxb);
@@ -196,7 +196,7 @@ void il4965_rx_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);

drivers/net/wireless/iwlegacy/iwl-4965-tx.c

+1 −1
Original line number Diff line number Diff line
@@ -1246,7 +1246,7 @@ void il4965_hwrate_to_tx_control(struct il_priv *il, u32 rate_n_flags, 
 * of frames sent via aggregation.

 */

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_compressed_ba_resp *ba_resp = &pkt->u.compressed_ba;