aboutsummaryrefslogtreecommitdiff
path: root/net/ipv4/udp_offload.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-02-04 19:47:55 -0800
committerDavid S. Miller <davem@davemloft.net>2014-02-04 19:47:55 -0800
commit9330ed16da840b1b68cd99600d403b6f3e9fa4e2 (patch)
tree57e07faeb8def276e9cb83446758ed1043d093d4 /net/ipv4/udp_offload.c
parentb045d37bd68c20ca88123c2b363cac5e3dae815f (diff)
parentcc689aaa7abf33b2ccb02482e5e17885ea8903d1 (diff)
Merge branch 'bonding_fail_over_mac'
Ding Tianhong says: ==================== bonding: Fix some issues for fail_over_mac The parameter fail_over_mac only affect active-backup mode, if it was set to active or follow and works with other modes, just like RR or XOR mode, the bonding could not set all slaves to the master's address, it will cause the slave could not work well with master. v1->v2: According Jay's suggestion, that we should permit setting an option at any time, but only have it take effect in active-backup mode, so I add mode checking together with fail_over_mac during enslavement and rebuild the patches. v2->v3: The correct way to fix the problem is that we should not add restrictions when setting options, just need to modify the bond enslave and removal processing to check the mode in addition to fail_over_mac when setting a slave's MAC during enslavement. The change active slave processing already only calls the fail_over_mac function when in active-backup mode. Remove the cleanup patch because the net-next is frozen now. ==================== Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
Diffstat (limited to 'net/ipv4/udp_offload.c')
0 files changed, 0 insertions, 0 deletions