Commit fb00bc2e authored Mar 12, 2014 by dingtianhong Committed by David S. Miller Mar 13, 2014

bonding: set correct vlan id for alb xmit path



The commit d3ab3ffd
(bonding: use rlb_client_info->vlan_id instead of ->tag)
remove the rlb_client_info->tag, but occur some issues,
The vlan_get_tag() will return 0 for success and -EINVAL for
error, so the client_info->vlan_id always be set to 0 if the
vlan_get_tag return 0 for success, so the client_info would
never get a correct vlan id.

We should only set the vlan id to 0 when the vlan_get_tag return error.

Fixes: d3ab3ffd (bonding: use rlb_client_info->vlan_id instead of ->tag)

CC: Ding Tianhong <dingtianhong@huawei.com>
CC: Jay Vosburgh <fubar@us.ibm.com>
CC: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Ding Tianhong <dingtianhong@huawei.com>
Acked-by: Veaceslav Falico <vfalico@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 6e07a1e0

drivers/net/bonding/bond_alb.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -730,7 +730,7 @@ static struct slave rlb_choose_channel(struct sk_buff skb, struct bonding *bon
		client_info->ntt = 0;
		}

		if (!vlan_get_tag(skb, &client_info->vlan_id))
		if (vlan_get_tag(skb, &client_info->vlan_id))
		client_info->vlan_id = 0;

		if (!client_info->assigned) {