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>

2 files changed, 2 insertions, 6 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,
                                           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)
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 8eb347106902..9a7209d075c8 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -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)