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

Commit 6abbe554 authored by Johannes Berg's avatar Johannes Berg Committed by Wey-Yi Guy
Browse files

iwlwifi: reduce beacon fill conditions 



Since the ibss_beacon variable will only be
filled in the appropriate modes, there's no
reason to be checking the mode again.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent c6fa17ed

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

+1 −3
Original line number Diff line number Diff line
@@ -292,9 +292,7 @@ static u32 iwl_fill_beacon_frame(struct iwl_priv *priv, 
					  struct ieee80211_hdr *hdr,

					  int left)

{

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

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

	     (priv->iw_mode != NL80211_IFTYPE_AP)))

	if (!priv->ibss_beacon)

		return 0;



	if (priv->ibss_beacon->len > left)

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

+1 −3
Original line number Diff line number Diff line
@@ -311,9 +311,7 @@ unsigned int iwl3945_fill_beacon_frame(struct iwl_priv *priv, 
				int left)

{



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

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

	     (priv->iw_mode != NL80211_IFTYPE_AP)))

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

		return 0;



	if (priv->ibss_beacon->len > left)