diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-06-22 11:32:41 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-06-22 11:32:41 +0200 |
| commit | 57fa8a1e22c5833fb2cae96af68fc39ec21cb017 (patch) | |
| tree | b0bb4e4a6e04a24119da30253add9fe9ffbc8d22 /net/openvswitch | |
| parent | ALSA: hda-beep: Update authors dead email address (diff) | |
| parent | Merge remote-tracking branch 'asoc/topic/wm8995' into asoc-next (diff) | |
| download | linux-57fa8a1e22c5833fb2cae96af68fc39ec21cb017.tar.xz linux-57fa8a1e22c5833fb2cae96af68fc39ec21cb017.zip | |
Merge tag 'asoc-v4.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Further updates for v4.2
There's a bunch of additional updates and fixes that came in since my
orignal pull request here, including DT support for rt5645 and fairly
large serieses of cleanups and improvements to tas2552 and rcar.
Diffstat (limited to 'net/openvswitch')
| -rw-r--r-- | net/openvswitch/vport-netdev.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/openvswitch/vport-netdev.c b/net/openvswitch/vport-netdev.c index 4776282c6417..33e6d6e2908f 100644 --- a/net/openvswitch/vport-netdev.c +++ b/net/openvswitch/vport-netdev.c @@ -125,6 +125,7 @@ static struct vport *netdev_create(const struct vport_parms *parms) if (err) goto error_master_upper_dev_unlink; + dev_disable_lro(netdev_vport->dev); dev_set_promiscuity(netdev_vport->dev, 1); netdev_vport->dev->priv_flags |= IFF_OVS_DATAPATH; rtnl_unlock(); |