From: Antoine Reversat Date: Thu, 16 Jun 2011 10:47:13 +0000 (+0000) Subject: vlan: don't call ndo_vlan_rx_register on hardware that doesn't have vlan support X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e3cb78c772de593afa720687ce3abbed8d93b0c3;p=openwrt%2Fstaging%2Fblogic.git vlan: don't call ndo_vlan_rx_register on hardware that doesn't have vlan support This patch removes the call to ndo_vlan_rx_register if the underlying device doesn't have hardware support for VLAN. Signed-off-by: Antoine Reversat Signed-off-by: David S. Miller --- diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index c7a581a96894..917ecb93ea28 100644 --- a/net/8021q/vlan.c +++ b/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); }