diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-08-15 20:43:46 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-08-15 20:43:46 +0200 |
| commit | f85a6597a6ce33fe4f390744b2764b30aa7bfda8 (patch) | |
| tree | 9b923afc20e7d3a7e78f98d600fd7e6633b4265b /drivers/net/veth.c | |
| parent | 140d37de62ffe8405282a1d6498f3b4099006384 (diff) | |
| parent | 44ffb69ec617f64cd83182e8b64d93b84758d636 (diff) | |
Merge tag 'asoc-v3.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.11
A few driver specific fixes here plus one core fix for a memory
corruption issue in DAPM initialisation which could lead to crashes.
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 da866523cf2..eee1f19ef1e 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; |