diff options
author | Rami Rosen <ramirose@gmail.com> | 2008-12-16 02:37:07 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-12-19 15:23:29 -0500 |
commit | 73ec1cc28ebc7854a376cde53f62d487e127fbca (patch) | |
tree | 1cd0794d5f0e3443136f39e749eb56fefe7d7d17 | |
parent | ca8a8560569c5eb954cb18c3a91087797ffa81a4 (diff) |
iwlwifi: remove a parameter (dest) from *_fill_beacon_frame() methods.
This patch removes a parameter (dest) from iwl_fill_beacon_frame() (iwl-agn.c)
and from iwl3945_fill_beacon_frame(). (iwl-3945.c,iwl-3945.h)
Signed-off-by: Rami Rosen <ramirose@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-3945.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-3945.h | 3 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 |
4 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c index d0c9bdcf393a..8fdb34222c0a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945.c +++ b/drivers/net/wireless/iwlwifi/iwl-3945.c | |||
@@ -2482,7 +2482,6 @@ unsigned int iwl3945_hw_get_beacon_cmd(struct iwl3945_priv *priv, | |||
2482 | 2482 | ||
2483 | frame_size = iwl3945_fill_beacon_frame(priv, | 2483 | frame_size = iwl3945_fill_beacon_frame(priv, |
2484 | tx_beacon_cmd->frame, | 2484 | tx_beacon_cmd->frame, |
2485 | iwl3945_broadcast_addr, | ||
2486 | sizeof(frame->u) - sizeof(*tx_beacon_cmd)); | 2485 | sizeof(frame->u) - sizeof(*tx_beacon_cmd)); |
2487 | 2486 | ||
2488 | BUG_ON(frame_size > MAX_MPDU_SIZE); | 2487 | BUG_ON(frame_size > MAX_MPDU_SIZE); |
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.h b/drivers/net/wireless/iwlwifi/iwl-3945.h index ec6084c8fd13..ffe5a8dd4210 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945.h +++ b/drivers/net/wireless/iwlwifi/iwl-3945.h | |||
@@ -590,8 +590,7 @@ extern int iwl3945_send_cmd_pdu(struct iwl3945_priv *priv, u8 id, u16 len, | |||
590 | extern int __must_check iwl3945_send_cmd(struct iwl3945_priv *priv, | 590 | extern int __must_check iwl3945_send_cmd(struct iwl3945_priv *priv, |
591 | struct iwl3945_host_cmd *cmd); | 591 | struct iwl3945_host_cmd *cmd); |
592 | extern unsigned int iwl3945_fill_beacon_frame(struct iwl3945_priv *priv, | 592 | extern unsigned int iwl3945_fill_beacon_frame(struct iwl3945_priv *priv, |
593 | struct ieee80211_hdr *hdr, | 593 | struct ieee80211_hdr *hdr,int left); |
594 | const u8 *dest, int left); | ||
595 | extern int iwl3945_rx_queue_update_write_ptr(struct iwl3945_priv *priv, | 594 | extern int iwl3945_rx_queue_update_write_ptr(struct iwl3945_priv *priv, |
596 | struct iwl3945_rx_queue *q); | 595 | struct iwl3945_rx_queue *q); |
597 | extern int iwl3945_send_statistics_request(struct iwl3945_priv *priv); | 596 | extern int iwl3945_send_statistics_request(struct iwl3945_priv *priv); |
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index bbc1c8052ffa..ac8f83b1da7f 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -371,7 +371,7 @@ static void iwl_free_frame(struct iwl_priv *priv, struct iwl_frame *frame) | |||
371 | 371 | ||
372 | static unsigned int iwl_fill_beacon_frame(struct iwl_priv *priv, | 372 | static unsigned int iwl_fill_beacon_frame(struct iwl_priv *priv, |
373 | struct ieee80211_hdr *hdr, | 373 | struct ieee80211_hdr *hdr, |
374 | const u8 *dest, int left) | 374 | int left) |
375 | { | 375 | { |
376 | if (!iwl_is_associated(priv) || !priv->ibss_beacon || | 376 | if (!iwl_is_associated(priv) || !priv->ibss_beacon || |
377 | ((priv->iw_mode != NL80211_IFTYPE_ADHOC) && | 377 | ((priv->iw_mode != NL80211_IFTYPE_ADHOC) && |
@@ -424,7 +424,6 @@ static unsigned int iwl_hw_get_beacon_cmd(struct iwl_priv *priv, | |||
424 | tx_beacon_cmd->tx.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE; | 424 | tx_beacon_cmd->tx.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE; |
425 | 425 | ||
426 | frame_size = iwl_fill_beacon_frame(priv, tx_beacon_cmd->frame, | 426 | frame_size = iwl_fill_beacon_frame(priv, tx_beacon_cmd->frame, |
427 | iwl_bcast_addr, | ||
428 | sizeof(frame->u) - sizeof(*tx_beacon_cmd)); | 427 | sizeof(frame->u) - sizeof(*tx_beacon_cmd)); |
429 | 428 | ||
430 | BUG_ON(frame_size > MAX_MPDU_SIZE); | 429 | BUG_ON(frame_size > MAX_MPDU_SIZE); |
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 352ccac7187b..d9c6bafff27c 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
@@ -1402,7 +1402,7 @@ static void iwl3945_free_frame(struct iwl3945_priv *priv, struct iwl3945_frame * | |||
1402 | 1402 | ||
1403 | unsigned int iwl3945_fill_beacon_frame(struct iwl3945_priv *priv, | 1403 | unsigned int iwl3945_fill_beacon_frame(struct iwl3945_priv *priv, |
1404 | struct ieee80211_hdr *hdr, | 1404 | struct ieee80211_hdr *hdr, |
1405 | const u8 *dest, int left) | 1405 | int left) |
1406 | { | 1406 | { |
1407 | 1407 | ||
1408 | if (!iwl3945_is_associated(priv) || !priv->ibss_beacon || | 1408 | if (!iwl3945_is_associated(priv) || !priv->ibss_beacon || |