diff options
| author | Grant Likely <grant.likely@linaro.org> | 2013-08-28 21:18:13 +0200 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2013-08-28 21:18:13 +0200 |
| commit | 8be137f2664f0abb096626a9d2ce0fcdd955b109 (patch) | |
| tree | 2c53a5535265a58eb397d6fbbab2ec26e92e6931 /drivers/net/veth.c | |
| parent | include: dt-binding: input: create a DT header defining key codes. (diff) | |
| parent | Linux 3.11-rc7 (diff) | |
| download | linux-8be137f2664f0abb096626a9d2ce0fcdd955b109.tar.xz linux-8be137f2664f0abb096626a9d2ce0fcdd955b109.zip | |
Merge tag 'v3.11-rc7' into devicetree/next
Linux 3.11-rc7
Diffstat (limited to 'drivers/net/veth.c')
| -rw-r--r-- | drivers/net/veth.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/veth.c b/drivers/net/veth.c index da866523cf20..eee1f19ef1e9 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c @@ -269,6 +269,7 @@ static void veth_setup(struct net_device *dev) dev->ethtool_ops = &veth_ethtool_ops; dev->features |= NETIF_F_LLTX; dev->features |= VETH_FEATURES; + dev->vlan_features = dev->features; dev->destructor = veth_dev_free; dev->hw_features = VETH_FEATURES; |