diff options
| author | John W. Linville <linville@tuxdriver.com> | 2015-09-18 16:20:32 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-09-21 16:24:33 -0700 |
| commit | 5eb8f289ac3020a9abad1c3c532ceca83284b6ed (patch) | |
| tree | 1e4b63841b6d9982567a4bd8df8ea663939262f6 /drivers/net | |
| parent | 4a476bd6d1d923922ec950ddc4c27b279f6901eb (diff) | |
geneve: remove vlan-related feature assignment
The code handling vlan tag insertion was dropped in commit 371bd1061d29
("geneve: Consolidate Geneve functionality in single module."). Now we
need to drop the related vlan feature bits in the netdev structure.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Reviewed-by: Jesse Gross <jesse@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/geneve.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c index da3259ce7c8d..8f1e9150341a 100644 --- a/drivers/net/geneve.c +++ b/drivers/net/geneve.c @@ -748,12 +748,8 @@ static void geneve_setup(struct net_device *dev) dev->features |= NETIF_F_RXCSUM; dev->features |= NETIF_F_GSO_SOFTWARE; - dev->vlan_features = dev->features; - dev->features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_STAG_TX; - dev->hw_features |= NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_RXCSUM; dev->hw_features |= NETIF_F_GSO_SOFTWARE; - dev->hw_features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_STAG_TX; netif_keep_dst(dev); dev->priv_flags |= IFF_LIVE_ADDR_CHANGE | IFF_NO_QUEUE; |