diff options
| author | David S. Miller | 2017-08-10 01:28:45 +0200 |
|---|---|---|
| committer | David S. Miller | 2017-08-10 01:28:45 +0200 |
| commit | 3118e6e19da7b8d76b2456b880c74a9aa3a2268b (patch) | |
| tree | 3060d11297c1195ef2d1f120d9c2247b4b1de4ae /drivers/net/hyperv/netvsc.c | |
| parent | net: ipv6: avoid overhead when no custom FIB rules are installed (diff) | |
| parent | futex: Remove unnecessary warning from get_futex_key (diff) | |
| download | kernel-qcow2-linux-3118e6e19da7b8d76b2456b880c74a9aa3a2268b.tar.gz kernel-qcow2-linux-3118e6e19da7b8d76b2456b880c74a9aa3a2268b.tar.xz kernel-qcow2-linux-3118e6e19da7b8d76b2456b880c74a9aa3a2268b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The UDP offload conflict is dealt with by simply taking what is
in net-next where we have removed all of the UFO handling code
entirely.
The TCP conflict was a case of local variables in a function
being removed from both net and net-next.
In netvsc we had an assignment right next to where a missing
set of u64 stats sync object inits were added.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/hyperv/netvsc.c')
| -rw-r--r-- | drivers/net/hyperv/netvsc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c index 208f03aa83de..bffaf93d3cb0 100644 --- a/drivers/net/hyperv/netvsc.c +++ b/drivers/net/hyperv/netvsc.c @@ -76,6 +76,7 @@ static struct netvsc_device *alloc_net_device(void) net_device->max_pkt = RNDIS_MAX_PKT_DEFAULT; net_device->pkt_align = RNDIS_PKT_ALIGN_DEFAULT; init_completion(&net_device->channel_init_wait); + init_waitqueue_head(&net_device->subchan_open); return net_device; } @@ -1268,6 +1269,8 @@ struct netvsc_device *netvsc_device_add(struct hv_device *device, nvchan->channel = device->channel; nvchan->net_device = net_device; + u64_stats_init(&nvchan->tx_stats.syncp); + u64_stats_init(&nvchan->rx_stats.syncp); } /* Enable NAPI handler before init callbacks */ |