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

[firefly-linux-kernel-4.4.55.git] / drivers / net / bonding / bond_alb.c

diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index 7c9d136e74bef3f725264aeef91fae32d99da168..e02cc265723abbaf397abbf84b0751d817dc5efd 100644 (file)
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -507,17 +507,17 @@ static void rlb_update_client(struct rlb_client_info *client_info)
                                 client_info->mac_dst);
                if (!skb) {
                        pr_err("%s: Error: failed to create an ARP packet\n",
-                              client_info->slave->dev->master->name);
+                              client_info->slave->bond->dev->name);
                        continue;
                }
 
                skb->dev = client_info->slave->dev;
 
                if (client_info->tag) {
-                       skb = vlan_put_tag(skb, client_info->vlan_id);
+                       skb = vlan_put_tag(skb, htons(ETH_P_8021Q), client_info->vlan_id);
                        if (!skb) {
                                pr_err("%s: Error: failed to insert VLAN tag\n",
-                                      client_info->slave->dev->master->name);
+                                      client_info->slave->bond->dev->name);
                                continue;
                        }
                }
@@ -1014,7 +1014,7 @@ static void alb_send_learning_packets(struct slave *slave, u8 mac_addr[])
                                continue;
                        }
 
-                       skb = vlan_put_tag(skb, vlan->vlan_id);
+                       skb = vlan_put_tag(skb, htons(ETH_P_8021Q), vlan->vlan_id);
                        if (!skb) {
                                pr_err("%s: Error: failed to insert VLAN tag\n",
                                       bond->dev->name);
@@ -1043,7 +1043,7 @@ static int alb_set_slave_mac_addr(struct slave *slave, u8 addr[])
        if (dev_set_mac_address(dev, &s_addr)) {
                pr_err("%s: Error: dev_set_mac_address of dev %s failed!\n"
                       "ALB mode requires that the base driver support setting the hw address also when the network device's interface is open\n",
-                      dev->master->name, dev->name);
+                      slave->bond->dev->name, dev->name);
                return -EOPNOTSUPP;
        }
        return 0;