From 1499ddd783436cfd650f5956491704b211b60178 Mon Sep 17 00:00:00 2001
From: Antoine Reversat <a.reversat@gmail.com>
Date: Thu, 16 Jun 2011 10:47:13 +0000
Subject: [PATCH] --- yaml --- r: 253866 b: refs/heads/master c:
 e3cb78c772de593afa720687ce3abbed8d93b0c3 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/net/8021q/vlan.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 08dba6b06e17..bf3ee4db9b6f 100644
--- 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
index c7a581a96894..917ecb93ea28 100644
--- 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);
 	}