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

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

iwlegacy: s/iwl_rx_packet/iwl_rx_pkt/ 



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

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

+7 −7
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ static void il3945_tx_queue_reclaim(struct il_priv *il, 
static void il3945_rx_reply_tx(struct il_priv *il,

				struct il_rx_mem_buffer *rxb)

{

	struct il_rx_packet *pkt = rxb_addr(rxb);

	struct il_rx_pkt *pkt = rxb_addr(rxb);

	u16 sequence = le16_to_cpu(pkt->hdr.sequence);

	int txq_id = SEQ_TO_QUEUE(sequence);

	int index = SEQ_TO_INDEX(sequence);
@@ -398,7 +398,7 @@ static void il3945_accumulative_statistics(struct il_priv *il, 
void il3945_hw_rx_statistics(struct il_priv *il,

		struct il_rx_mem_buffer *rxb)

{

	struct il_rx_packet *pkt = rxb_addr(rxb);

	struct il_rx_pkt *pkt = rxb_addr(rxb);



	D_RX("Statistics notification received (%d vs %d).\n",

		     (int)sizeof(struct il3945_notif_statistics),
@@ -413,7 +413,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_packet *pkt = rxb_addr(rxb);

	struct il_rx_pkt *pkt = rxb_addr(rxb);

	__le32 *flag = (__le32 *)&pkt->u.raw;



	if (le32_to_cpu(*flag) & UCODE_STATISTICS_CLEAR_MSK) {
@@ -459,7 +459,7 @@ static void il3945_pass_packet_to_mac80211(struct il_priv *il, 
				   struct il_rx_mem_buffer *rxb,

				   struct ieee80211_rx_status *stats)

{

	struct il_rx_packet *pkt = rxb_addr(rxb);

	struct il_rx_pkt *pkt = rxb_addr(rxb);

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)IL_RX_DATA(pkt);

	struct il3945_rx_frame_hdr *rx_hdr = IL_RX_HDR(pkt);

	struct il3945_rx_frame_end *rx_end = IL_RX_END(pkt);
@@ -510,7 +510,7 @@ static void il3945_rx_reply_rx(struct il_priv *il, 
{

	struct ieee80211_hdr *header;

	struct ieee80211_rx_status rx_status;

	struct il_rx_packet *pkt = rxb_addr(rxb);

	struct il_rx_pkt *pkt = rxb_addr(rxb);

	struct il3945_rx_frame_stats *rx_stats = IL_RX_STATS(pkt);

	struct il3945_rx_frame_hdr *rx_hdr = IL_RX_HDR(pkt);

	struct il3945_rx_frame_end *rx_end = IL_RX_END(pkt);
@@ -1654,7 +1654,7 @@ static int il3945_send_rxon_assoc(struct il_priv *il, 
				   struct il_rxon_context *ctx)

{

	int rc = 0;

	struct il_rx_packet *pkt;

	struct il_rx_pkt *pkt;

	struct il3945_rxon_assoc_cmd rxon_assoc;

	struct il_host_cmd cmd = {

		.id = REPLY_RXON_ASSOC,
@@ -1683,7 +1683,7 @@ static int il3945_send_rxon_assoc(struct il_priv *il, 
	if (rc)

		return rc;



	pkt = (struct il_rx_packet *)cmd.reply_page;

	pkt = (struct il_rx_pkt *)cmd.reply_page;

	if (pkt->hdr.flags & IL_CMD_FAILED_MSK) {

		IL_ERR("Bad return from REPLY_RXON_ASSOC command\n");

		rc = -EIO;

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

+2 −2
Original line number Diff line number Diff line
@@ -570,7 +570,7 @@ void il4965_rx_reply_rx(struct il_priv *il, 
{

	struct ieee80211_hdr *header;

	struct ieee80211_rx_status rx_status;

	struct il_rx_packet *pkt = rxb_addr(rxb);

	struct il_rx_pkt *pkt = rxb_addr(rxb);

	struct il_rx_phy_res *phy_res;

	__le32 rx_pkt_status;

	struct il_rx_mpdu_res_start *amsdu;
@@ -688,7 +688,7 @@ void il4965_rx_reply_rx(struct il_priv *il, 
void il4965_rx_reply_rx_phy(struct il_priv *il,

			    struct il_rx_mem_buffer *rxb)

{

	struct il_rx_packet *pkt = rxb_addr(rxb);

	struct il_rx_pkt *pkt = rxb_addr(rxb);

	il->_4965.last_phy_res_valid = true;

	memcpy(&il->_4965.last_phy_res, pkt->u.raw,

	       sizeof(struct il_rx_phy_res));

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

+3 −3
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ void il4965_rx_missed_beacon_notif(struct il_priv *il, 
				struct il_rx_mem_buffer *rxb)



{

	struct il_rx_packet *pkt = rxb_addr(rxb);

	struct il_rx_pkt *pkt = rxb_addr(rxb);

	struct il_missed_beacon_notif *missed_beacon;



	missed_beacon = &pkt->u.missed_beacon;
@@ -155,7 +155,7 @@ void il4965_rx_statistics(struct il_priv *il, 
			      struct il_rx_mem_buffer *rxb)

{

	int change;

	struct il_rx_packet *pkt = rxb_addr(rxb);

	struct il_rx_pkt *pkt = rxb_addr(rxb);



	D_RX(

		     "Statistics notification received (%d vs %d).\n",
@@ -198,7 +198,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_packet *pkt = rxb_addr(rxb);

	struct il_rx_pkt *pkt = rxb_addr(rxb);



	if (le32_to_cpu(pkt->u.stats.flag) & UCODE_STATISTICS_CLEAR_MSK) {

#ifdef CONFIG_IWLEGACY_DEBUGFS

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

+1 −1
Original line number Diff line number Diff line
@@ -1248,7 +1248,7 @@ void il4965_hwrate_to_tx_control(struct il_priv *il, u32 rate_n_flags, 
void il4965_rx_reply_compressed_ba(struct il_priv *il,

					   struct il_rx_mem_buffer *rxb)

{

	struct il_rx_packet *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_tx_queue *txq = NULL;

	struct il_ht_agg *agg;

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

+2 −2
Original line number Diff line number Diff line
@@ -1774,7 +1774,7 @@ static int il4965_get_ra_sta_id(struct il_priv *il, struct ieee80211_hdr *hdr) 
static void il4965_rx_reply_tx(struct il_priv *il,

				struct il_rx_mem_buffer *rxb)

{

	struct il_rx_packet *pkt = rxb_addr(rxb);

	struct il_rx_pkt *pkt = rxb_addr(rxb);

	u16 sequence = le16_to_cpu(pkt->hdr.sequence);

	int txq_id = SEQ_TO_QUEUE(sequence);

	int index = SEQ_TO_INDEX(sequence);
@@ -1877,7 +1877,7 @@ static void il4965_rx_reply_tx(struct il_priv *il, 
static void il4965_rx_beacon_notif(struct il_priv *il,

				    struct il_rx_mem_buffer *rxb)

{

	struct il_rx_packet *pkt = rxb_addr(rxb);

	struct il_rx_pkt *pkt = rxb_addr(rxb);

	struct il4965_beacon_notif *beacon = (void *)pkt->u.raw;

	u8 rate __maybe_unused =

		il4965_hw_get_rate(beacon->beacon_notify_hdr.rate_n_flags);