vlan: make vlan_dev_real_dev work over stacked vlans

nikolay@redhat.com · davem330 · commit 0369722f024c · 2013-08-05T12:17:42.000-07:00
Sometimes we might have stacked vlans on top of each other, and we're
interested in the first non-vlan real device on the path, so transform
vlan_dev_real_dev to go over the stacked vlans and extract the first
non-vlan device.

Signed-off-by: Nikolay Aleksandrov &lt;nikolay@redhat.com&gt;
Signed-off-by: Veaceslav Falico &lt;vfalico@redhat.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c
@@ -91,7 +91,12 @@ EXPORT_SYMBOL(__vlan_find_dev_deep);
 
 struct net_device *vlan_dev_real_dev(const struct net_device *dev)
 {
-	return vlan_dev_priv(dev)->real_dev;
+	struct net_device *ret = vlan_dev_priv(dev)->real_dev;
+
+	while (is_vlan_dev(ret))
+		ret = vlan_dev_priv(ret)->real_dev;
+
+	return ret;
 }
 EXPORT_SYMBOL(vlan_dev_real_dev);
 

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,12 @@ EXPORT_SYMBOL(__vlan_find_dev_deep);`
`91`	`91`
`92`	`92`	`struct net_device vlan_dev_real_dev(const struct net_device dev)`
`93`	`93`	`{`
`94`		`- return vlan_dev_priv(dev)->real_dev;`
	`94`	`+ struct net_device *ret = vlan_dev_priv(dev)->real_dev;`
	`95`	`+`
	`96`	`+ while (is_vlan_dev(ret))`
	`97`	`+ ret = vlan_dev_priv(ret)->real_dev;`
	`98`	`+`
	`99`	`+ return ret;`
`95`	`100`	`}`
`96`	`101`	`EXPORT_SYMBOL(vlan_dev_real_dev);`
`97`	`102`