From: David S. Miller Date: Mon, 15 Sep 2014 21:19:55 +0000 (-0400) Subject: Merge branch 'bonding-cleanups' X-Git-Tag: v3.18-rc1~52^2~55 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6cca9adb786184be21f30be0982e3ea0281f75cb;p=karo-tx-linux.git Merge branch 'bonding-cleanups' Nikolay Aleksandrov says: ==================== bonding: style, comment and assertion changes This is a small and simple patch-set that doesn't introduce (hopefully) any functional changes, but only stylistic and semantic ones. Patch 01 simply uses the already provided __rlb_next_rx_slave function inside rlb_next_rx_slave(), thus removing the duplication of code. Patch 02 changes all comments that I could find to netdev style, removes some outdated ones and fixes a few more small cosmetic issues (new line after declaration, braces around if; else and such) Patch 03 removes one extra ASSERT_RTNL() because we already have it in the parent function and consolidates two other ASSERT_RTNL()s to the function that is exported and supposed to be called with RTNL anyway. ==================== Signed-off-by: David S. Miller --- 6cca9adb786184be21f30be0982e3ea0281f75cb