aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl3945-base.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2010-02-18 13:56:57 -0500
committerReinette Chatre <reinette.chatre@intel.com>2010-03-09 19:04:27 -0500
commit254aebf3d0439e7b0a8318f1604b3fdb4144f689 (patch)
tree7cf2f5d673821be4fd1efe69c55853992d602827 /drivers/net/wireless/iwlwifi/iwl3945-base.c
parentb4665df448b316fd5282f4947e27eaf92dc105bb (diff)
iwlwifi: remove frame dropping
With some of the new code in mac80211, public action frames can be exchanged as non-injected frames even while not associated. Aside from that, dropping frames here is pointless since we do deal with arbitrary frames that were injected already, so let mac80211 make the decision about which frames to allow or not. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl3945-base.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index a825092fff90..2b2c96bf5a53 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -504,15 +504,6 @@ static int iwl3945_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
504 IWL_DEBUG_TX(priv, "Sending REASSOC frame\n"); 504 IWL_DEBUG_TX(priv, "Sending REASSOC frame\n");
505#endif 505#endif
506 506
507 /* drop all non-injected data frame if we are not associated */
508 if (ieee80211_is_data(fc) &&
509 !(info->flags & IEEE80211_TX_CTL_INJECTED) &&
510 (!iwl_is_associated(priv) ||
511 ((priv->iw_mode == NL80211_IFTYPE_STATION) && !priv->assoc_id))) {
512 IWL_DEBUG_DROP(priv, "Dropping - !iwl_is_associated\n");
513 goto drop_unlock;
514 }
515
516 spin_unlock_irqrestore(&priv->lock, flags); 507 spin_unlock_irqrestore(&priv->lock, flags);
517 508
518 hdr_len = ieee80211_hdrlen(fc); 509 hdr_len = ieee80211_hdrlen(fc);