Merge branch 'bna-cleanups'

Ivan Vecera says:

====================
bna: clean-up 2

Next round of cleaning patches.
====================

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