Overlapping changes all over.

The mini-qdisc bits were a little bit tricky, however.
Signed-off-by: NDavid S. Miller <davem@davemloft.net>