diff options
| author | David S. Miller <davem@davemloft.net> | 2014-03-29 18:48:54 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-29 18:48:54 -0400 |
| commit | 64c27237a07129758e33f5f824ba5c33b7f57417 (patch) | |
| tree | 4c0c0a9b6d282d600f2226e1b3510096b9d789dd /drivers/net/veth.c | |
| parent | 77a9939426f7a3f35f460afc9b11f1fe45955409 (diff) | |
| parent | 49d8137a4039c63c834827f4bfe875e27bb9c521 (diff) | |
| download | talos-obmc-linux-64c27237a07129758e33f5f824ba5c33b7f57417.tar.gz talos-obmc-linux-64c27237a07129758e33f5f824ba5c33b7f57417.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/marvell/mvneta.c
The mvneta.c conflict is a case of overlapping changes,
a conversion to devm_ioremap_resource() vs. a conversion
to netdev_alloc_pcpu_stats.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/veth.c')
| -rw-r--r-- | drivers/net/veth.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/veth.c b/drivers/net/veth.c index e1c77d4b80e4..b4a10bcb66a0 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c @@ -278,7 +278,10 @@ static void veth_setup(struct net_device *dev) dev->features |= NETIF_F_LLTX; dev->features |= VETH_FEATURES; dev->vlan_features = dev->features & - ~(NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_STAG_TX); + ~(NETIF_F_HW_VLAN_CTAG_TX | + NETIF_F_HW_VLAN_STAG_TX | + NETIF_F_HW_VLAN_CTAG_RX | + NETIF_F_HW_VLAN_STAG_RX); dev->destructor = veth_dev_free; dev->hw_features = VETH_FEATURES; |
