Merge branch 'bonding-next'
authorDavid S. Miller <davem@davemloft.net>
Wed, 26 Mar 2014 20:40:39 +0000 (16:40 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 26 Mar 2014 20:40:39 +0000 (16:40 -0400)
commit5a6b99170c7042702112c64bec46bcca9fbcc6d7
tree47e16b3d7a6b6b63790aa032c26adab9b04271f9
parent7aceb47a9df3383b24824c3e4bd4f029e4598fda
parent9152e26df20b9e5ffdbe0d5b96d0e9ff8b33ff31
Merge branch 'bonding-next'

Ding Tianhong says:

====================
bonding: slight optimization and avoid spam for bond xmit path

v1->v2: Add ratelimit for debugging is not a good idea, it will miss some message
if the user turns the debugging on, so remove the patch 3.
use net_err_ratelimited instead of pr_err_ratelimited and use __func__ instead of
bond_xmit_broadcast().
====================

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