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

Commit c1354754 authored by Tomas Winkler's avatar Tomas Winkler Committed by John W. Linville
Browse files

iwlwifi: move iwl_rx_missed_beacon_notif to iwl-rx.c 



This patch moves iwl_rx_missed_beacon_notif rx handler to iwl-rx.c.

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 42132bce

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

+0 −22
Original line number Diff line number Diff line
@@ -2898,26 +2898,7 @@ static void iwl4965_rx_reply_rx_phy(struct iwl_priv *priv, 
	memcpy(&priv->last_phy_res[1], &(pkt->u.raw[0]),

	       sizeof(struct iwl4965_rx_phy_res));

}

static void iwl4965_rx_missed_beacon_notif(struct iwl_priv *priv,

					   struct iwl_rx_mem_buffer *rxb)



{

#ifdef CONFIG_IWL4965_RUN_TIME_CALIB

	struct iwl_rx_packet *pkt = (struct iwl_rx_packet *)rxb->skb->data;

	struct iwl4965_missed_beacon_notif *missed_beacon;



	missed_beacon = &pkt->u.missed_beacon;

	if (le32_to_cpu(missed_beacon->consequtive_missed_beacons) > 5) {

		IWL_DEBUG_CALIB("missed bcn cnsq %d totl %d rcd %d expctd %d\n",

		    le32_to_cpu(missed_beacon->consequtive_missed_beacons),

		    le32_to_cpu(missed_beacon->total_missed_becons),

		    le32_to_cpu(missed_beacon->num_recvd_beacons),

		    le32_to_cpu(missed_beacon->num_expected_beacons));

		if (!test_bit(STATUS_SCANNING, &priv->status))

			iwl_init_sensitivity(priv);

	}

#endif /*CONFIG_IWL4965_RUN_TIME_CALIB*/

}

#ifdef CONFIG_IWL4965_HT



/**
@@ -3508,9 +3489,6 @@ static void iwl4965_rx_handler_setup(struct iwl_priv *priv) 
	priv->rx_handlers[REPLY_RX_PHY_CMD] = iwl4965_rx_reply_rx_phy;

	priv->rx_handlers[REPLY_RX_MPDU_CMD] = iwl4965_rx_reply_rx;



	priv->rx_handlers[MISSED_BEACONS_NOTIFICATION] =

	    iwl4965_rx_missed_beacon_notif;



#ifdef CONFIG_IWL4965_HT

	priv->rx_handlers[REPLY_COMPRESSED_BA] = iwl4965_rx_reply_compressed_ba;

#endif /* CONFIG_IWL4965_HT */

drivers/net/wireless/iwlwifi/iwl-core.h

+3 −0
Original line number Diff line number Diff line
@@ -204,6 +204,9 @@ int iwl_rx_init(struct iwl_priv *priv, struct iwl_rx_queue *rxq); 
int iwl_rx_queue_restock(struct iwl_priv *priv);

int iwl_rx_queue_space(const struct iwl_rx_queue *q);

void iwl_rx_allocate(struct iwl_priv *priv);

/* Handlers */

void iwl_rx_missed_beacon_notif(struct iwl_priv *priv,

			       struct iwl_rx_mem_buffer *rxb);



/*****************************************************

* TX

drivers/net/wireless/iwlwifi/iwl-rx.c

+22 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include "iwl-core.h"

#include "iwl-sta.h"

#include "iwl-io.h"

#include "iwl-calib.h"

#include "iwl-helpers.h"

/************************** RX-FUNCTIONS ****************************/

/*
@@ -446,3 +447,24 @@ int iwl_rxq_stop(struct iwl_priv *priv) 
}

EXPORT_SYMBOL(iwl_rxq_stop);



void iwl_rx_missed_beacon_notif(struct iwl_priv *priv,

				struct iwl_rx_mem_buffer *rxb)



{

#ifdef CONFIG_IWLWIFI_RUN_TIME_CALIB

	struct iwl_rx_packet *pkt = (struct iwl_rx_packet *)rxb->skb->data;

	struct iwl4965_missed_beacon_notif *missed_beacon;



	missed_beacon = &pkt->u.missed_beacon;

	if (le32_to_cpu(missed_beacon->consequtive_missed_beacons) > 5) {

		IWL_DEBUG_CALIB("missed bcn cnsq %d totl %d rcd %d expctd %d\n",

		    le32_to_cpu(missed_beacon->consequtive_missed_beacons),

		    le32_to_cpu(missed_beacon->total_missed_becons),

		    le32_to_cpu(missed_beacon->num_recvd_beacons),

		    le32_to_cpu(missed_beacon->num_expected_beacons));

		if (!test_bit(STATUS_SCANNING, &priv->status))

			iwl_init_sensitivity(priv);

	}

#endif /* CONFIG_IWLWIFI_RUN_TIME_CALIB */

}

EXPORT_SYMBOL(iwl_rx_missed_beacon_notif);

drivers/net/wireless/iwlwifi/iwl4965-base.c

+3 −0
Original line number Diff line number Diff line
@@ -2255,6 +2255,9 @@ static void iwl4965_setup_rx_handlers(struct iwl_priv *priv) 
	priv->rx_handlers[CARD_STATE_NOTIFICATION] = iwl4965_rx_card_state_notif;

	priv->rx_handlers[REPLY_TX] = iwl4965_rx_reply_tx;



	priv->rx_handlers[MISSED_BEACONS_NOTIFICATION] =

	    iwl_rx_missed_beacon_notif;



	/* Set up hardware specific Rx handlers */

	priv->cfg->ops->lib->rx_handler_setup(priv);

}