aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_metrics.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-01-22 17:45:39 -0800
committerDavid S. Miller <davem@davemloft.net>2014-01-22 17:45:39 -0800
commit7705b10463622006dce368a47fa9d4dd7b6489ec (patch)
tree61838a39f6928bccd585ea86c2282dff550a81e5 /net/ipv4/tcp_metrics.c
parentnet: vxlan: convert to act as a pernet subsystem (diff)
parentbonding: update bonding.txt for primary description (diff)
downloadlinux-dev-7705b10463622006dce368a47fa9d4dd7b6489ec.tar.xz
linux-dev-7705b10463622006dce368a47fa9d4dd7b6489ec.zip
Merge branch 'bonding'
Ding Tianhong says: ==================== bonding: fix primary problem for bonding If the slave's name changed, and the bond params primary is exist, the bond should deal with the situation in two ways: 1) If the slave was the primary slave yet, clean the primary slave and reselect active slave. 2) If the slave's new name is as same as bond primary, set the slave as primary slave and reselect active slave. If the new primary is not matching any slave in the bond, the bond should record it to params, clean the primary slave and select a new active slave. Update bonding.txt for primary description. v2.1->v1: Because there are too many indentions and useless verification, so rewrite the logic for updating the primary slave. Modify some comments for to clean the typos. v3->v2.1: Veaceslav disagree the first patch and modify the logic for it (bonding: update the primary slave when changing slave's name) and resend it himself (bonding: handle slave's name change with primary_slave logic), so remove the first patch and send the last two patches. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_metrics.c')
0 files changed, 0 insertions, 0 deletions