[PATCH] bonding: fix feature consolidation
authorJay Vosburgh <fubar@us.ibm.com>
Sat, 5 Nov 2005 02:45:45 +0000 (18:45 -0800)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 8 Nov 2005 02:50:00 +0000 (21:50 -0500)
commit8e3babcd69ec0fde874838e276eb0b211c6a5647
treee9ec29bf1d94ab8b77bb536c77433e21fa2f73ba
parentfd7a516efbcdabf5d7b9307ca9fe48b511b7d123
[PATCH] bonding: fix feature consolidation

This should resolve http://bugzilla.kernel.org/show_bug.cgi?id=5519

The current feature computation loses bits that it doesn't know about,
resulting in an inability to add VLANs and possibly other havoc.
Rewrote function to preserve bits it doesn't know about, remove an
unneeded state variable, and simplify the code.

Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/bonding/bond_main.c
drivers/net/bonding/bonding.h