Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[pandora-kernel.git] / drivers / net / bonding / bond_alb.c

diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index 2df9276..7f8b20a 100644 (file)
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -635,7 +635,7 @@ static struct slave *rlb_choose_channel(struct sk_buff *skb, struct bonding *bon
                        client_info->ntt = 0;
                }
 
-               if (bond->vlgrp) {
+               if (bond_vlan_used(bond)) {
                        if (!vlan_get_tag(skb, &client_info->vlan_id))
                                client_info->tag = 1;
                }
@@ -847,7 +847,7 @@ static void alb_send_learning_packets(struct slave *slave, u8 mac_addr[])
                skb->priority = TC_PRIO_CONTROL;
                skb->dev = slave->dev;
 
-               if (bond->vlgrp) {
+               if (bond_vlan_used(bond)) {
                        struct vlan_entry *vlan;
 
                        vlan = bond_next_vlan(bond,