diff options
| author | Vlad Yasevich <vyasevic@redhat.com> | 2014-03-27 22:14:47 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-28 17:16:50 -0400 |
| commit | 8dd6e147b0c29723ec10d0e836c7f3466d61a19b (patch) | |
| tree | 0a0af7135b0d78b55399f544222c4b460d99609b | |
| parent | f6d1ac4b5f15f57929fe0fa283b3a45dfec717a0 (diff) | |
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 <vyasevic@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ifb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c index c14d39bf32d0..d7b2e947184b 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; |