From: David S. Miller <davem@davemloft.net>
Date: Mon, 15 Sep 2014 21:19:55 +0000 (-0400)
Subject: Merge branch 'bonding-cleanups'
X-Git-Tag: firefly_0821_release~176^2~3043^2~55
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6cca9adb786184be21f30be0982e3ea0281f75cb;p=firefly-linux-kernel-4.4.55.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 <davem@davemloft.net>
---

6cca9adb786184be21f30be0982e3ea0281f75cb