1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/wireless/mwifiex/11n_aggr.c b/drivers/net/wireless/mwifiex/11n_aggr.c
index 04222f27665f..395f1bfd4102 100644
--- a/drivers/net/wireless/mwifiex/11n_aggr.c
+++ b/drivers/net/wireless/mwifiex/11n_aggr.c
@@ -82,8 +82,8 @@ mwifiex_11n_form_amsdu_pkt(struct sk_buff *skb_aggr,
         /* Add payload */
         memcpy(skb_put(skb_aggr, skb_src->len), skb_src->data, skb_src->len);
 
-        *pad = (((skb_src->len + LLC_SNAP_LEN) & 3)) ? (4 - (((skb_src->len +
-                                                      LLC_SNAP_LEN)) & 3)) : 0;
+        /* Add padding for new MSDU to start from 4 byte boundary */
+        *pad = (4 - ((unsigned long)skb_aggr->tail & 0x3)) % 4;
 
         return skb_aggr->len + *pad;
 }