Merge branch 'bonding-next'
authorDavid S. Miller <davem@davemloft.net>
Fri, 16 May 2014 20:34:43 +0000 (16:34 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 16 May 2014 20:34:43 +0000 (16:34 -0400)
commitbd508065749fcaa99f6eca927530d0d7e019224f
treec6ad54191e3ed0afc12f62cd5f546189058ec096
parent31ff6aa5c86f7564f0dd97c5b3e1404cad238d00
parent8557cd74ca8af9a71ae19d445e33d92bd50a6dc5
Merge branch 'bonding-next'

Veaceslav Falico says:

====================
bonding: simple macro cleanup

Trivial patchset that converts most of the bonding's macros into inline
functions. It introduces only one macro, BOND_MODE(), which is just
bond->params.mode, better to write/understand/remember.

The only real change is the removal of IFF_UP verification, which always
came in pair with && netif_running(), and is though useless, as it's always
IFF_UP when LINK_STATE_RUNNING.

v2->v3: fix 3/9 to actually invert bond_mode_uses_arp() and add
bond_uses_arp() alongside bond_mode_uses_arp()
v1->v2: use inlined functions instead of macros.
====================

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