From 06f61f49b6db9449aa59ad76ed62f4630f675954 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Fri, 6 Feb 2009 00:27:32 +0100
Subject: [PATCH] --- yaml --- r: 131311 b: refs/heads/master c:
 f1b33cb1c25ac476cbf22783f9ca2016f99648ed h: refs/heads/master i:   131309:
 c3f4b5bc4ef861bf256472c6fe774c4392956805   131307:
 5cc8bcf9310e80afa216e068a02e8f8a88b5e3bc   131303:
 4d68ec46031307d8e329e08f9c96f28e2bbb167c   131295:
 63e556fe0722b38eebdd6dfe15612417593d728c v: v3

---
 [refs]                  | 2 +-
 trunk/net/mac80211/tx.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9b4f16b013e1..08b489ef22aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcf6b1bca8cdfefc986909b57277af4628955bd8
+refs/heads/master: f1b33cb1c25ac476cbf22783f9ca2016f99648ed
diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c
index 4278e545638f..94de5033f0b6 100644
--- a/trunk/net/mac80211/tx.c
+++ b/trunk/net/mac80211/tx.c
@@ -1343,6 +1343,8 @@ int ieee80211_master_start_xmit(struct sk_buff *skb, struct net_device *dev)
 						list) {
 				if (!netif_running(sdata->dev))
 					continue;
+				if (sdata->vif.type != NL80211_IFTYPE_AP)
+					continue;
 				if (compare_ether_addr(sdata->dev->dev_addr,
 						       hdr->addr2)) {
 					dev_hold(sdata->dev);