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);