This series mixes cleanups with a bug fix.

The cleanup is only appropriate for net-next, and the bug fix is
appropriate for net.

Also, your header posting here was empty.  It must actually
say something.

Specifically it must always say what the patch series is doing,
why it is doing it, and why it is doing it that way.

Thanks.