This reverts commit bf292f1b.

It belongs in 'net-next' not 'net'.
Signed-off-by: NDavid S. Miller <davem@davemloft.net>