tree d22984bcaf0e223a471377f67dc83827f0cae7a6
parent a09ceb0e08140a1eec05b49b4c232d3481339cb0
author Florian Westphal <fw@strlen.de> 1465424863 +0200
committer David S. Miller <davem@davemloft.net> 1465455532 -0700

sched: place state, next_sched and gso_skb in same cacheline again

Earlier commits removed two members from struct Qdisc which places
next_sched/gso_skb into a different cacheline than ->state.

This restores the struct layout to what it was before the removal.
Move the two members, then add an annotation so they all reside in the
same cacheline.

This adds a 16 byte hole after cpu_qstats.

The hole could be closed but as it doesn't decrease total struct size just
do it this way.

Reported-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>