---

yaml --- r: 327443 b: refs/heads/master c: bda1b1b h: refs/heads/master i: 327441: 9186308 327439: e8b20d0 v: v3
git-mirror · Aug 6, 2012 · 2f7e110 · 2f7e110
1 parent 2934103
commit 2f7e110
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d273ef32a0d68f2751f74f7401de78f3c95afa8
+refs/heads/master: bda1b1b77918ea340bbfb2938a0fd7d5203e430c
diff --git a/trunk/drivers/net/wireless/mwifiex/11n_aggr.c b/trunk/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;
 }