diff options
author | David S. Miller <davem@davemloft.net> | 2013-04-19 17:49:11 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-04-19 17:49:11 -0400 |
commit | 0cb670eef554652d0aa40bf09bd850e62598fc6c (patch) | |
tree | de50df492d43f49a83af0ec2fa029d8855d55dd6 /kernel/tsacct.c | |
parent | cb95ec6261a205bde6451b972fbd6e1581608cae (diff) | |
parent | d632ce989c811863a1ce9b1c53dae2cf06b35c49 (diff) |
Merge branch 'bonding'
Nikolay Aleksandrov says:
====================
This patch-set fixes mainly bugs on enslave failure and one occasion
of a needed locking. The patches are:
1. On enslave failure mc addresses are not flushed from the slave
2. On enslave failure vlans are not cleaned up from the slave
3. On enslave failure the bond's primary and curr_active_slave
are not cleaned up (which might result in use of freed memory)
4. On enslave failure netpoll is not disabled which might result in
a memory leak
5. In bond_mc_swap() the bond's mc addr list is walked without
netif_addr_lock, since it can be called without rtnl, add it
v2: patch 01 - fix log message and remove unnecessary code move
====================
Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/tsacct.c')
0 files changed, 0 insertions, 0 deletions