1 files changed, 4 insertions, 0 deletions

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 4278e545638f..37e3d5ef7e3f 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -752,6 +752,8 @@ ieee80211_tx_h_fragment(struct ieee80211_tx_data *tx)
                 skb_copy_queue_mapping(frag, first);
 
                 frag->do_not_encrypt = first->do_not_encrypt;
+                frag->dev = first->dev;
+                frag->iif = first->iif;
 
                 pos += copylen;
                 left -= copylen;
@@ -1343,6 +1345,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);