git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
net
/
mac80211
/
tx.c
diff --git
a/net/mac80211/tx.c
b/net/mac80211/tx.c
index 4278e545638fbeae16c5ffd0795a4835a4358c21..94de5033f0b6d331c796b0241a1a64d8827704e0 100644
(file)
--- a/
net/mac80211/tx.c
+++ b/
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);