aboutsummaryrefslogtreecommitdiffstats
path: root/net/8021q/vlan.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/8021q/vlan.c')
-rw-r--r--net/8021q/vlan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index cfa9afe9b11e..d24c4644b930 100644
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -207,7 +207,7 @@ int register_vlan_dev(struct net_device *dev)
207 grp->nr_vlans++; 207 grp->nr_vlans++;
208 208
209 if (ngrp) { 209 if (ngrp) {
210 if (ops->ndo_vlan_rx_register) 210 if (ops->ndo_vlan_rx_register && (real_dev->features & NETIF_F_HW_VLAN_RX))
211 ops->ndo_vlan_rx_register(real_dev, ngrp); 211 ops->ndo_vlan_rx_register(real_dev, ngrp);
212 rcu_assign_pointer(real_dev->vlgrp, ngrp); 212 rcu_assign_pointer(real_dev->vlgrp, ngrp);
213 } 213 }