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

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

iwlwifi: move beacon handling to iwl4965-base.c 



This patch concentrates becaon handling in iwl4965-base.c.

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d783b061

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

+0 −32
Original line number Diff line number Diff line
@@ -1689,38 +1689,6 @@ static int iwl4965_shared_mem_rx_idx(struct iwl_priv *priv) 
	return le32_to_cpu(s->rb_closed) & 0xFFF;

}



unsigned int iwl4965_hw_get_beacon_cmd(struct iwl_priv *priv,

			  struct iwl_frame *frame, u8 rate)

{

	struct iwl4965_tx_beacon_cmd *tx_beacon_cmd;

	unsigned int frame_size;



	tx_beacon_cmd = &frame->u.beacon;

	memset(tx_beacon_cmd, 0, sizeof(*tx_beacon_cmd));



	tx_beacon_cmd->tx.sta_id = priv->hw_params.bcast_sta_id;

	tx_beacon_cmd->tx.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;



	frame_size = iwl4965_fill_beacon_frame(priv,

				tx_beacon_cmd->frame,

				iwl_bcast_addr,

				sizeof(frame->u) - sizeof(*tx_beacon_cmd));



	BUG_ON(frame_size > MAX_MPDU_SIZE);

	tx_beacon_cmd->tx.len = cpu_to_le16((u16)frame_size);



	if ((rate == IWL_RATE_1M_PLCP) || (rate >= IWL_RATE_2M_PLCP))

		tx_beacon_cmd->tx.rate_n_flags =

			iwl_hw_set_rate_n_flags(rate, RATE_MCS_CCK_MSK);

	else

		tx_beacon_cmd->tx.rate_n_flags =

			iwl_hw_set_rate_n_flags(rate, 0);



	tx_beacon_cmd->tx.tx_flags = (TX_CMD_FLG_SEQ_CTL_MSK |

				TX_CMD_FLG_TSF_MSK | TX_CMD_FLG_STA_RATE_MSK);

	return (sizeof(*tx_beacon_cmd) + frame_size);

}



static int iwl4965_alloc_shared_mem(struct iwl_priv *priv)

{

	priv->shared_virt = pci_alloc_consistent(priv->pci_dev,

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

+1 −1
Original line number Diff line number Diff line
@@ -2324,7 +2324,7 @@ struct iwl4965_beacon_notif { 
/*

 * REPLY_TX_BEACON = 0x91 (command, has simple generic response)

 */

struct iwl4965_tx_beacon_cmd {

struct iwl_tx_beacon_cmd {

	struct iwl_tx_cmd tx;

	__le16 tim_idx;

	u8 tim_size;

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

+1 −2
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ enum iwl_pwr_src { 
struct iwl_frame {

	union {

		struct ieee80211_hdr frame;

		struct iwl4965_tx_beacon_cmd beacon;

		struct iwl_tx_beacon_cmd beacon;

		u8 raw[IEEE80211_FRAME_LEN];

		u8 cmd[360];

	} u;
@@ -286,7 +286,6 @@ struct iwl_cmd { 
		struct iwl_powertable_cmd powertable;

		struct iwl_qosparam_cmd qosparam;

		struct iwl_tx_cmd tx;

		struct iwl4965_tx_beacon_cmd tx_beacon;

		struct iwl4965_rxon_assoc_cmd rxon_assoc;

		struct iwl_rem_sta_cmd rm_sta;

		u8 *indirect;

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

+35 −4
Original line number Diff line number Diff line
@@ -444,11 +444,10 @@ static void iwl_free_frame(struct iwl_priv *priv, struct iwl_frame *frame) 
	list_add(&frame->list, &priv->free_frames);

}



unsigned int iwl4965_fill_beacon_frame(struct iwl_priv *priv,

static unsigned int iwl_fill_beacon_frame(struct iwl_priv *priv,

					  struct ieee80211_hdr *hdr,

					  const u8 *dest, int left)

{



	if (!iwl_is_associated(priv) || !priv->ibss_beacon ||

	    ((priv->iw_mode != IEEE80211_IF_TYPE_IBSS) &&

	     (priv->iw_mode != IEEE80211_IF_TYPE_AP)))
@@ -487,6 +486,38 @@ static u8 iwl4965_rate_get_lowest_plcp(struct iwl_priv *priv) 
		return IWL_RATE_6M_PLCP;

}



unsigned int iwl4965_hw_get_beacon_cmd(struct iwl_priv *priv,

				       struct iwl_frame *frame, u8 rate)

{

	struct iwl_tx_beacon_cmd *tx_beacon_cmd;

	unsigned int frame_size;



	tx_beacon_cmd = &frame->u.beacon;

	memset(tx_beacon_cmd, 0, sizeof(*tx_beacon_cmd));



	tx_beacon_cmd->tx.sta_id = priv->hw_params.bcast_sta_id;

	tx_beacon_cmd->tx.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;



	frame_size = iwl_fill_beacon_frame(priv, tx_beacon_cmd->frame,

				iwl_bcast_addr,

				sizeof(frame->u) - sizeof(*tx_beacon_cmd));



	BUG_ON(frame_size > MAX_MPDU_SIZE);

	tx_beacon_cmd->tx.len = cpu_to_le16((u16)frame_size);



	if ((rate == IWL_RATE_1M_PLCP) || (rate >= IWL_RATE_2M_PLCP))

		tx_beacon_cmd->tx.rate_n_flags =

			iwl_hw_set_rate_n_flags(rate, RATE_MCS_CCK_MSK);

	else

		tx_beacon_cmd->tx.rate_n_flags =

			iwl_hw_set_rate_n_flags(rate, 0);



	tx_beacon_cmd->tx.tx_flags = TX_CMD_FLG_SEQ_CTL_MSK |

				     TX_CMD_FLG_TSF_MSK |

				     TX_CMD_FLG_STA_RATE_MSK;



	return sizeof(*tx_beacon_cmd) + frame_size;

}

static int iwl4965_send_beacon_cmd(struct iwl_priv *priv)

{

	struct iwl_frame *frame;