diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-12-02 15:46:37 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-12-02 15:46:37 -0500 |
| commit | 09f921f83faa49cdea25abfb98c439c01526b89d (patch) | |
| tree | 1e8ee5c8f14e0e57965eca81bc6725288fd3597b /net/mac80211/tx.c | |
| parent | 4cebb34caa5122216a1e2451eae9e0fc47ec2589 (diff) | |
| parent | d89197c7f34934fbb0f96d938a0d6cfe0b8bcb1c (diff) | |
| download | linux-3.10-09f921f83faa49cdea25abfb98c439c01526b89d.tar.gz linux-3.10-09f921f83faa49cdea25abfb98c439c01526b89d.tar.bz2 linux-3.10-09f921f83faa49cdea25abfb98c439c01526b89d.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
Diffstat (limited to 'net/mac80211/tx.c')
| -rw-r--r-- | net/mac80211/tx.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index e69483647f3..2ba74265682 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -1595,7 +1595,12 @@ static void ieee80211_xmit(struct ieee80211_sub_if_data *sdata, list) { if (!ieee80211_sdata_running(tmp_sdata)) continue; - if (tmp_sdata->vif.type != NL80211_IFTYPE_AP) + if (tmp_sdata->vif.type == + NL80211_IFTYPE_MONITOR || + tmp_sdata->vif.type == + NL80211_IFTYPE_AP_VLAN || + tmp_sdata->vif.type == + NL80211_IFTYPE_WDS) continue; if (compare_ether_addr(tmp_sdata->vif.addr, hdr->addr2) == 0) { |