From: David S. Miller Date: Fri, 16 May 2014 20:34:43 +0000 (-0400) Subject: Merge branch 'bonding-next' X-Git-Tag: v3.16-rc1~27^2~209 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=bd508065749fcaa99f6eca927530d0d7e019224f;p=~emulex%2Finfiniband.git 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 --- bd508065749fcaa99f6eca927530d0d7e019224f