diff options
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 4 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 4 |
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, | |||
| 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) |
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, | |||
| 311 | int left) | 311 | int left) |
| 312 | { | 312 | { |
| 313 | 313 | ||
| 314 | if (!iwl_is_associated(priv) || !priv->ibss_beacon || | 314 | if (!iwl_is_associated(priv) || !priv->ibss_beacon) |
| 315 | ((priv->iw_mode != NL80211_IFTYPE_ADHOC) && | ||
| 316 | (priv->iw_mode != NL80211_IFTYPE_AP))) | ||
| 317 | return 0; | 315 | return 0; |
| 318 | 316 | ||
| 319 | if (priv->ibss_beacon->len > left) | 317 | if (priv->ibss_beacon->len > left) |