X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=drivers%2Fnet%2Fifb.c;h=d7b2e947184b549a5034e4a54423ecde9050d721;hb=8dd6e147b0c29723ec10d0e836c7f3466d61a19b;hp=c14d39bf32d06a6f8d1b42a29b36dcd84b25c8f6;hpb=8e7030097e9f3ea8031e8cc4230e357cb556f8f9;p=~andy%2Flinux

diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
index c14d39bf32d..d7b2e947184 100644
--- a/drivers/net/ifb.c
+++ b/drivers/net/ifb.c
@@ -180,7 +180,8 @@ static void ifb_setup(struct net_device *dev)
 	dev->tx_queue_len = TX_Q_LIMIT;
 
 	dev->features |= IFB_FEATURES;
-	dev->vlan_features |= IFB_FEATURES;
+	dev->vlan_features |= IFB_FEATURES & ~(NETIF_F_HW_VLAN_CTAG_TX |
+					       NETIF_F_HW_VLAN_STAG_TX);
 
 	dev->flags |= IFF_NOARP;
 	dev->flags &= ~IFF_MULTICAST;