X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=drivers%2Fnet%2Fveth.c;h=c0e7c64765abd449070a7bce6826a994c674b8c7;hb=3f8c707b9a83cd956af65796081b6c8cb8716089;hp=2ec2041b62d4eb215bf23f74ad82ba44332b8d3d;hpb=c4de673b775e4db48cd2db6277e0c6714332ca0c;p=~andy%2Flinux

diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index 2ec2041b62d..c0e7c64765a 100644
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -285,7 +285,11 @@ static void veth_setup(struct net_device *dev)
 	dev->ethtool_ops = &veth_ethtool_ops;
 	dev->features |= NETIF_F_LLTX;
 	dev->features |= VETH_FEATURES;
-	dev->vlan_features = dev->features;
+	dev->vlan_features = dev->features &
+			     ~(NETIF_F_HW_VLAN_CTAG_TX |
+			       NETIF_F_HW_VLAN_STAG_TX |
+			       NETIF_F_HW_VLAN_CTAG_RX |
+			       NETIF_F_HW_VLAN_STAG_RX);
 	dev->destructor = veth_dev_free;
 
 	dev->hw_features = VETH_FEATURES;