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

diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index 2ec2041b62d..5b374370f71 100644
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -285,7 +285,8 @@ 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);
 	dev->destructor = veth_dev_free;
 
 	dev->hw_features = VETH_FEATURES;