vlan: Set correct source MAC address with TX VLAN offload enabled

Peter Boström · davem330 · commit dd38743b4cc2 · 2014-03-10T22:21:51.000-04:00
With TX VLAN offload enabled the source MAC address for frames sent using the VLAN interface is currently set to the address of the real interface. This is wrong since the VLAN interface may be configured with a different address. The bug was introduced in commit 2205369 ("vlan: Fix header ops passthru when doing TX VLAN offload."). This patch sets the source address before calling the create function of the real interface. Signed-off-by: Peter Boström <peter.bostrom@netrounds.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
@@ -538,6 +538,9 @@ static int vlan_passthru_hard_header(struct sk_buff *skb, struct net_device *dev
 	struct vlan_dev_priv *vlan = vlan_dev_priv(dev);
 	struct net_device *real_dev = vlan->real_dev;
 
+	if (saddr == NULL)
+		saddr = dev->dev_addr;
+
 	return dev_hard_header(skb, real_dev, type, daddr, saddr, len);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -538,6 +538,9 @@ static int vlan_passthru_hard_header(struct sk_buff skb, struct net_device dev`
`538`	`538`	`struct vlan_dev_priv *vlan = vlan_dev_priv(dev);`
`539`	`539`	`struct net_device *real_dev = vlan->real_dev;`
`540`	`540`
	`541`	`+ if (saddr == NULL)`
	`542`	`+ saddr = dev->dev_addr;`
	`543`	`+`
`541`	`544`	`return dev_hard_header(skb, real_dev, type, daddr, saddr, len);`
`542`	`545`	`}`
`543`	`546`