diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2008-07-18 01:53:03 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-08-04 15:09:07 -0400 |
commit | 4bf64efd26f5610cde4fb7846e2f37bd1f62d3a9 (patch) | |
tree | 00e54951b21ffaf2e1c5f2e1459698cb4065ff3a /drivers/net/wireless/iwlwifi/iwl-4965.c | |
parent | d783b061077f92af55244aef1df8780b0f46b5af (diff) |
iwlwifi: move beacon handling to iwl4965-base.c
This patch concentrates becaon handling in iwl4965-base.c.
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-4965.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index 3cc6f00d96cd..9ae8525b9b60 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c | |||
@@ -1689,38 +1689,6 @@ static int iwl4965_shared_mem_rx_idx(struct iwl_priv *priv) | |||
1689 | return le32_to_cpu(s->rb_closed) & 0xFFF; | 1689 | return le32_to_cpu(s->rb_closed) & 0xFFF; |
1690 | } | 1690 | } |
1691 | 1691 | ||
1692 | unsigned int iwl4965_hw_get_beacon_cmd(struct iwl_priv *priv, | ||
1693 | struct iwl_frame *frame, u8 rate) | ||
1694 | { | ||
1695 | struct iwl4965_tx_beacon_cmd *tx_beacon_cmd; | ||
1696 | unsigned int frame_size; | ||
1697 | |||
1698 | tx_beacon_cmd = &frame->u.beacon; | ||
1699 | memset(tx_beacon_cmd, 0, sizeof(*tx_beacon_cmd)); | ||
1700 | |||
1701 | tx_beacon_cmd->tx.sta_id = priv->hw_params.bcast_sta_id; | ||
1702 | tx_beacon_cmd->tx.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE; | ||
1703 | |||
1704 | frame_size = iwl4965_fill_beacon_frame(priv, | ||
1705 | tx_beacon_cmd->frame, | ||
1706 | iwl_bcast_addr, | ||
1707 | sizeof(frame->u) - sizeof(*tx_beacon_cmd)); | ||
1708 | |||
1709 | BUG_ON(frame_size > MAX_MPDU_SIZE); | ||
1710 | tx_beacon_cmd->tx.len = cpu_to_le16((u16)frame_size); | ||
1711 | |||
1712 | if ((rate == IWL_RATE_1M_PLCP) || (rate >= IWL_RATE_2M_PLCP)) | ||
1713 | tx_beacon_cmd->tx.rate_n_flags = | ||
1714 | iwl_hw_set_rate_n_flags(rate, RATE_MCS_CCK_MSK); | ||
1715 | else | ||
1716 | tx_beacon_cmd->tx.rate_n_flags = | ||
1717 | iwl_hw_set_rate_n_flags(rate, 0); | ||
1718 | |||
1719 | tx_beacon_cmd->tx.tx_flags = (TX_CMD_FLG_SEQ_CTL_MSK | | ||
1720 | TX_CMD_FLG_TSF_MSK | TX_CMD_FLG_STA_RATE_MSK); | ||
1721 | return (sizeof(*tx_beacon_cmd) + frame_size); | ||
1722 | } | ||
1723 | |||
1724 | static int iwl4965_alloc_shared_mem(struct iwl_priv *priv) | 1692 | static int iwl4965_alloc_shared_mem(struct iwl_priv *priv) |
1725 | { | 1693 | { |
1726 | priv->shared_virt = pci_alloc_consistent(priv->pci_dev, | 1694 | priv->shared_virt = pci_alloc_consistent(priv->pci_dev, |