Commit bda1b1b7 authored by Yogesh Ashok Powar's avatar Yogesh Ashok Powar Committed by John W. Linville
Browse files

mwifiex: correction in MSDU padding logic 



Padding arithmetic will always work for MSDUs provided first MSDU
ends on 4-byte boundary. Fixing it by making sure that all MSDU ends
on 4-byte boundary.

Signed-off-by: default avatarYogesh Ashok Powar <yogeshp@marvell.com>
Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarKiran Divekar <dkiran@marvell.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7d273ef3

drivers/net/wireless/mwifiex/11n_aggr.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

}