1 files changed, 10 insertions, 3 deletions

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 45aad3d3108c..c2a6da5d80da 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -231,7 +231,7 @@ static void ieee80211_handle_mu_mimo_mon(struct ieee80211_sub_if_data *sdata,
                 struct ieee80211_hdr_3addr hdr;
                 u8 category;
                 u8 action_code;
-        } __packed action;
+        } __packed __aligned(2) action;
 
         if (!sdata)
                 return;
@@ -2644,6 +2644,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
         struct ieee80211_sub_if_data *sdata = rx->sdata;
         struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
         u16 ac, q, hdrlen;
+        int tailroom = 0;
 
         hdr = (struct ieee80211_hdr *) skb->data;
         hdrlen = ieee80211_hdrlen(hdr->frame_control);
@@ -2723,15 +2724,21 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
         skb_set_queue_mapping(skb, q);
 
         if (!--mesh_hdr->ttl) {
-                IEEE80211_IFSTA_MESH_CTR_INC(ifmsh, dropped_frames_ttl);
+                if (!is_multicast_ether_addr(hdr->addr1))
+                        IEEE80211_IFSTA_MESH_CTR_INC(ifmsh,
+                                                     dropped_frames_ttl);
                 goto out;
         }
 
         if (!ifmsh->mshcfg.dot11MeshForwarding)
                 goto out;
 
+        if (sdata->crypto_tx_tailroom_needed_cnt)
+                tailroom = IEEE80211_ENCRYPT_TAILROOM;
+
         fwd_skb = skb_copy_expand(skb, local->tx_headroom +
-                                       sdata->encrypt_headroom, 0, GFP_ATOMIC);
+                                       sdata->encrypt_headroom,
+                                  tailroom, GFP_ATOMIC);
         if (!fwd_skb)
                 goto out;