From: Vlad Yasevich Date: Fri, 28 Mar 2014 02:14:47 +0000 (-0400) Subject: ifb: Remove vlan acceleration from vlan_features X-Git-Tag: v3.14~8^2^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8dd6e147b0c29723ec10d0e836c7f3466d61a19b;p=kernel%2Fkernel-generic.git ifb: Remove vlan acceleration from vlan_features Do not include vlan acceleration features in vlan_features as that precludes correct Q-in-Q operation. Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller --- diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c index c14d39b..d7b2e94 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;