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/hyperv_net.h | |
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/hyperv_net.h')
-rw-r--r-- | drivers/net/hyperv/hyperv_net.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h index d1ea99a12cf2..98b25f6900c8 100644 --- a/drivers/net/hyperv/hyperv_net.h +++ b/drivers/net/hyperv/hyperv_net.h @@ -776,7 +776,8 @@ struct netvsc_device { u32 max_chn; u32 num_chn; - refcount_t sc_offered; + atomic_t open_chn; + wait_queue_head_t subchan_open; struct rndis_device *extension; |