diff --git a/[refs] b/[refs] index fbd169c89e05..e12b5a2b77e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4db4e0a17fb0e7b345b344cde141b252794c2f19 +refs/heads/master: 5220da39b4f6bd2ee69d298111ebebc0de886f2f diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c index 6fad8fac3784..5a75fc020807 100644 --- a/trunk/net/mac80211/tx.c +++ b/trunk/net/mac80211/tx.c @@ -2265,10 +2265,10 @@ static void ieee80211_beacon_add_tim(struct ieee80211_if_ap *bss, /* Bitmap control */ *pos++ = n1 | aid0; /* Part Virt Bitmap */ + skb_put(skb, n2 - n1); memcpy(pos, bss->tim + n1, n2 - n1 + 1); tim[1] = n2 - n1 + 4; - skb_put(skb, n2 - n1); } else { *pos++ = aid0; /* Bitmap control */ *pos++ = 0; /* Part Virt Bitmap */