diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-03-14 09:42:34 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-03-14 09:46:02 +1000 |
| commit | 9b61c0fcdf0cfd20a85d9856d46142e7f297de0a (patch) | |
| tree | d4abe6aa3f4e1e088f9da1d0597e078b1fe58912 /drivers/net/hyperv/netvsc_drv.c | |
| parent | 550e3b23a53c88adfa46e64f9d442743e65d47da (diff) | |
| parent | 125234dc8b1cc862f52d8bd5b37c36cc59b2cb86 (diff) | |
Merge drm-fixes into drm-next.
Nouveau wanted this to avoid some worse conflicts when I merge that.
Diffstat (limited to 'drivers/net/hyperv/netvsc_drv.c')
| -rw-r--r-- | drivers/net/hyperv/netvsc_drv.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index 1d3a66563bac..98e34fee45c7 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@ -1089,6 +1089,9 @@ static int netvsc_probe(struct hv_device *dev, net->ethtool_ops = ðtool_ops; SET_NETDEV_DEV(net, &dev->device); + /* We always need headroom for rndis header */ + net->needed_headroom = RNDIS_AND_PPI_SIZE; + /* Notify the netvsc driver of the new device */ memset(&device_info, 0, sizeof(device_info)); device_info.ring_size = ring_size; |