The following commit has been merged in the batman-adv/next branch: commit 7d273ef32a0d68f2751f74f7401de78f3c95afa8 Author: Yogesh Ashok Powar yogeshp@marvell.com Date: Fri Aug 3 18:06:00 2012 -0700

mwifiex: remove extra padding to AMSDU

Since commit: fb3c19bc9687d972b83faf366b38ac807eca8f25, adding extra padding to AMSDU is redundant since same is being performed at mwifiex_11n_aggregate_pkt after forming the AMSDU packet. Fixing it by removing it.

Signed-off-by: Yogesh Ashok Powar yogeshp@marvell.com Signed-off-by: Amitkumar Karwar akarwar@marvell.com Signed-off-by: Kiran Divekar dkiran@marvell.com Signed-off-by: Bing Zhao bzhao@marvell.com Signed-off-by: John W. Linville linville@tuxdriver.com

diff --git a/drivers/net/wireless/mwifiex/11n_aggr.c b/drivers/net/wireless/mwifiex/11n_aggr.c index c631c7c..04222f2 100644 --- a/drivers/net/wireless/mwifiex/11n_aggr.c +++ b/drivers/net/wireless/mwifiex/11n_aggr.c @@ -84,7 +84,6 @@ mwifiex_11n_form_amsdu_pkt(struct sk_buff *skb_aggr,

*pad = (((skb_src->len + LLC_SNAP_LEN) & 3)) ? (4 - (((skb_src->len + LLC_SNAP_LEN)) & 3)) : 0; - skb_put(skb_aggr, *pad);

return skb_aggr->len + *pad; }