diff options
| author | dingtianhong <dingtianhong@huawei.com> | 2014-03-12 17:31:59 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-13 15:45:10 -0400 |
| commit | fb00bc2e6cd2046282ba4b03f4fe682aee70b2f8 (patch) | |
| tree | ed8dba22d85be0abf16589af0b564b4c06bb59fc /drivers/net/bonding/bond_alb.c | |
| parent | 6e07a1e0b53d77dbcb08f29d1cca07c6d33a926f (diff) | |
| download | blackbird-obmc-linux-fb00bc2e6cd2046282ba4b03f4fe682aee70b2f8.tar.gz blackbird-obmc-linux-fb00bc2e6cd2046282ba4b03f4fe682aee70b2f8.zip | |
bonding: set correct vlan id for alb xmit path
The commit d3ab3ffd1d728d7ee77340e7e7e2c7cfe6a4013e
(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: d3ab3ffd1d7 (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>
Diffstat (limited to 'drivers/net/bonding/bond_alb.c')
| -rw-r--r-- | drivers/net/bonding/bond_alb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c index a2c47476804d..e8f133e926aa 100644 --- a/drivers/net/bonding/bond_alb.c +++ b/drivers/net/bonding/bond_alb.c @@ -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) { |
