net: Revert unused variable changes.

This reverts commits:

c573972c
1a590434
da2e2c21



They were meant for net-next not net.

Signed-off-by: David S. Miller <davem@davemloft.net>