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

Commit 73ec1cc2 authored by Rami Rosen's avatar Rami Rosen Committed by John W. Linville
Browse files

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: default avatarRami Rosen <ramirose@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ca8a8560

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

+0 −1
Original line number Diff line number Diff line
@@ -2482,7 +2482,6 @@ unsigned int iwl3945_hw_get_beacon_cmd(struct iwl3945_priv *priv, 


	frame_size = iwl3945_fill_beacon_frame(priv,

				tx_beacon_cmd->frame,

				iwl3945_broadcast_addr,

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



	BUG_ON(frame_size > MAX_MPDU_SIZE);

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

+1 −2
Original line number Diff line number Diff line
@@ -590,8 +590,7 @@ extern int iwl3945_send_cmd_pdu(struct iwl3945_priv *priv, u8 id, u16 len, 
extern int __must_check iwl3945_send_cmd(struct iwl3945_priv *priv,

		struct iwl3945_host_cmd *cmd);

extern unsigned int iwl3945_fill_beacon_frame(struct iwl3945_priv *priv,

					struct ieee80211_hdr *hdr,

					const u8 *dest, int left);

					struct ieee80211_hdr *hdr,int left);

extern int iwl3945_rx_queue_update_write_ptr(struct iwl3945_priv *priv,

					 struct iwl3945_rx_queue *q);

extern int iwl3945_send_statistics_request(struct iwl3945_priv *priv);

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

+1 −2
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ static void iwl_free_frame(struct iwl_priv *priv, struct iwl_frame *frame) 


static unsigned int iwl_fill_beacon_frame(struct iwl_priv *priv,

					  struct ieee80211_hdr *hdr,

					  const u8 *dest, int left)

					  int left)

{

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

	    ((priv->iw_mode != NL80211_IFTYPE_ADHOC) &&
@@ -424,7 +424,6 @@ static unsigned int iwl_hw_get_beacon_cmd(struct iwl_priv *priv, 
	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);

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

+1 −1
Original line number Diff line number Diff line
@@ -1402,7 +1402,7 @@ static void iwl3945_free_frame(struct iwl3945_priv *priv, struct iwl3945_frame * 


unsigned int iwl3945_fill_beacon_frame(struct iwl3945_priv *priv,

				struct ieee80211_hdr *hdr,

				const u8 *dest, int left)

				int left)

{



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