---

yaml --- r: 253866 b: refs/heads/master c: e3cb78c h: refs/heads/master v: v3
git-mirror · Jun 17, 2011 · 1499ddd · 1499ddd
1 parent 806bc82
commit 1499ddd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1b7f85e4f632f9cc342d8a34a3903feaf47a261
+refs/heads/master: e3cb78c772de593afa720687ce3abbed8d93b0c3
diff --git a/trunk/net/8021q/vlan.c b/trunk/net/8021q/vlan.c
@@ -205,7 +205,7 @@ int register_vlan_dev(struct net_device *dev)
 	grp->nr_vlans++;
 
 	if (ngrp) {
-		if (ops->ndo_vlan_rx_register)
+		if (ops->ndo_vlan_rx_register && (real_dev->features & NETIF_F_HW_VLAN_RX))
 			ops->ndo_vlan_rx_register(real_dev, ngrp);
 		rcu_assign_pointer(real_dev->vlgrp, ngrp);
 	}