diff options
Diffstat (limited to 'drivers/net/bonding/bond_alb.c')
| -rw-r--r-- | drivers/net/bonding/bond_alb.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c index b57bc9467dbe..3f58c3d0b710 100644 --- a/drivers/net/bonding/bond_alb.c +++ b/drivers/net/bonding/bond_alb.c | |||
| @@ -678,12 +678,8 @@ static struct slave *rlb_choose_channel(struct sk_buff *skb, struct bonding *bon | |||
| 678 | } | 678 | } |
| 679 | 679 | ||
| 680 | if (!list_empty(&bond->vlan_list)) { | 680 | if (!list_empty(&bond->vlan_list)) { |
| 681 | unsigned short vlan_id; | 681 | if (!vlan_get_tag(skb, &client_info->vlan_id)) |
| 682 | int res = vlan_get_tag(skb, &vlan_id); | ||
| 683 | if (!res) { | ||
| 684 | client_info->tag = 1; | 682 | client_info->tag = 1; |
| 685 | client_info->vlan_id = vlan_id; | ||
| 686 | } | ||
| 687 | } | 683 | } |
| 688 | 684 | ||
| 689 | if (!client_info->assigned) { | 685 | if (!client_info->assigned) { |