aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2010-07-15 08:59:07 -0400
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2010-07-23 11:42:40 -0400
commit6abbe554bab8ab908b3963577e14dc2e716fd485 (patch)
tree75503622b83a5cbfe3d64e5f4c41fe3ea9b4b354 /drivers/net/wireless/iwlwifi/iwl-agn.c
parentc6fa17ed3fadaf056173c409c0877df428a152ec (diff)
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: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index f8f8ea220ce1..9a78189c64f9 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -292,9 +292,7 @@ static u32 iwl_fill_beacon_frame(struct iwl_priv *priv,
292 struct ieee80211_hdr *hdr, 292 struct ieee80211_hdr *hdr,
293 int left) 293 int left)
294{ 294{
295 if (!iwl_is_associated(priv) || !priv->ibss_beacon || 295 if (!priv->ibss_beacon)
296 ((priv->iw_mode != NL80211_IFTYPE_ADHOC) &&
297 (priv->iw_mode != NL80211_IFTYPE_AP)))
298 return 0; 296 return 0;
299 297
300 if (priv->ibss_beacon->len > left) 298 if (priv->ibss_beacon->len > left)