From 2f7e11057da298a3772866d1a134a197488c87e9 Mon Sep 17 00:00:00 2001 From: Yogesh Ashok Powar Date: Fri, 3 Aug 2012 18:06:01 -0700 Subject: [PATCH] --- yaml --- r: 327443 b: refs/heads/master c: bda1b1b77918ea340bbfb2938a0fd7d5203e430c h: refs/heads/master i: 327441: 91863089b857ff7ef9359193fdd9306de914ae0f 327439: e8b20d08b1f118f20b2a2508e29d04729909ecf2 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/mwifiex/11n_aggr.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7e748c578aa5..ecc7bf6f4788 100644 --- 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 index 04222f27665f..395f1bfd4102 100644 --- 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; }