aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-tx.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/iwl-tx.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/iwl-tx.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-tx.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c
index 1ed5206721e..08b33fcc079 100644
--- a/drivers/net/wireless/iwlwifi/iwl-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-tx.c
@@ -761,16 +761,6 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
761 IWL_DEBUG_TX(priv, "Sending REASSOC frame\n"); 761 IWL_DEBUG_TX(priv, "Sending REASSOC frame\n");
762#endif 762#endif
763 763
764 /* drop all non-injected data frame if we are not associated */
765 if (ieee80211_is_data(fc) &&
766 !(info->flags & IEEE80211_TX_CTL_INJECTED) &&
767 (!iwl_is_associated(priv) ||
768 ((priv->iw_mode == NL80211_IFTYPE_STATION) && !priv->assoc_id) ||
769 !priv->assoc_station_added)) {
770 IWL_DEBUG_DROP(priv, "Dropping - !iwl_is_associated\n");
771 goto drop_unlock;
772 }
773
774 hdr_len = ieee80211_hdrlen(fc); 764 hdr_len = ieee80211_hdrlen(fc);
775 765
776 /* Find (or create) index into station table for destination station */ 766 /* Find (or create) index into station table for destination station */