1 files changed, 7 insertions, 12 deletions

diff --git a/drivers/net/wireless/marvell/mwifiex/11n_aggr.c b/drivers/net/wireless/marvell/mwifiex/11n_aggr.c
index c47d6366875d..a75013ac84d7 100644
--- a/drivers/net/wireless/marvell/mwifiex/11n_aggr.c
+++ b/drivers/net/wireless/marvell/mwifiex/11n_aggr.c
@@ -101,13 +101,6 @@ mwifiex_11n_form_amsdu_txpd(struct mwifiex_private *priv,
 {
         struct txpd *local_tx_pd;
         struct mwifiex_txinfo *tx_info = MWIFIEX_SKB_TXCB(skb);
-        unsigned int pad;
-        int headroom = (priv->adapter->iface_type ==
-                        MWIFIEX_USB) ? 0 : INTF_HEADER_LEN;
-
-        pad = ((void *)skb->data - sizeof(*local_tx_pd) -
-                headroom - NULL) & (MWIFIEX_DMA_ALIGN_SZ - 1);
-        skb_push(skb, pad);
 
         skb_push(skb, sizeof(*local_tx_pd));
 
@@ -121,12 +114,10 @@ mwifiex_11n_form_amsdu_txpd(struct mwifiex_private *priv,
         local_tx_pd->bss_num = priv->bss_num;
         local_tx_pd->bss_type = priv->bss_type;
         /* Always zero as the data is followed by struct txpd */
-        local_tx_pd->tx_pkt_offset = cpu_to_le16(sizeof(struct txpd) +
-                                                 pad);
+        local_tx_pd->tx_pkt_offset = cpu_to_le16(sizeof(struct txpd));
         local_tx_pd->tx_pkt_type = cpu_to_le16(PKT_TYPE_AMSDU);
         local_tx_pd->tx_pkt_length = cpu_to_le16(skb->len -
-                                                 sizeof(*local_tx_pd) -
-                                                 pad);
+                                                 sizeof(*local_tx_pd));
 
         if (tx_info->flags & MWIFIEX_BUF_FLAG_TDLS_PKT)
                 local_tx_pd->flags |= MWIFIEX_TXPD_FLAGS_TDLS_PACKET;
@@ -190,7 +181,11 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv,
                                        ra_list_flags);
                 return -1;
         }
-        skb_reserve(skb_aggr, MWIFIEX_MIN_DATA_HEADER_LEN);
+
+        /* skb_aggr->data already 64 byte align, just reserve bus interface
+         * header and txpd.
+         */
+        skb_reserve(skb_aggr, headroom + sizeof(struct txpd));
         tx_info_aggr =  MWIFIEX_SKB_TXCB(skb_aggr);
 
         memset(tx_info_aggr, 0, sizeof(*tx_info_aggr));