]> Pileus Git - ~andy/linux/commit
vlan: fix bond/team enslave of vlan challenged slave/port
authorJiri Pirko <jiri@resnulli.us>
Sun, 14 Oct 2012 04:30:56 +0000 (04:30 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 16 Oct 2012 18:41:46 +0000 (14:41 -0400)
commit55462cf30ad9768fff6a6d36db21879146a39bdf
treef306def961d7f9ca6cc835c5133c592973f91a0c
parent73b7656ce4e09eb137ee6f845a9e11a7f132df1c
vlan: fix bond/team enslave of vlan challenged slave/port

In vlan_uses_dev() check for number of vlan devs rather than existence
of vlan_info. The reason is that vlan id 0 is there without appropriate
vlan dev on it by default which prevented from enslaving vlan challenged
dev.

Reported-by: Jon Stanley <jstanley@rmrf.net>
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/bonding/bond_main.c
net/8021q/vlan_core.c