diff options
| author | Linus Torvalds | 2017-02-04 19:44:15 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2017-02-04 19:44:15 +0100 |
| commit | 412e6d3fec247b2bc83106514b0fb3b17e2eb7fe (patch) | |
| tree | cbd241740a61d7ff60742d6f94d1564e796fb405 /drivers/net | |
| parent | Merge tag 'staging-4.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | Drivers: hv: vmbus: finally fix hv_need_to_signal_on_read() (diff) | |
| download | kernel-qcow2-linux-412e6d3fec247b2bc83106514b0fb3b17e2eb7fe.tar.gz kernel-qcow2-linux-412e6d3fec247b2bc83106514b0fb3b17e2eb7fe.tar.xz kernel-qcow2-linux-412e6d3fec247b2bc83106514b0fb3b17e2eb7fe.zip | |
Merge tag 'char-misc-4.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc driver fixes from Greg KH:
"Here are two bugfixes that resolve some reported issues. One in the
firmware loader, that should fix the much-reported problem of crashes
with it. The other is a hyperv fix for a reported regression.
Both have been in linux-next for a week or so with no reported issues"
* tag 'char-misc-4.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
Drivers: hv: vmbus: finally fix hv_need_to_signal_on_read()
firmware: fix NULL pointer dereference in __fw_load_abort()
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/hyperv/netvsc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c index 5a1cc089acb7..86e5749226ef 100644 --- a/drivers/net/hyperv/netvsc.c +++ b/drivers/net/hyperv/netvsc.c @@ -1295,6 +1295,9 @@ void netvsc_channel_cb(void *context) ndev = hv_get_drvdata(device); buffer = get_per_channel_state(channel); + /* commit_rd_index() -> hv_signal_on_read() needs this. */ + init_cached_read_index(channel); + do { desc = get_next_pkt_raw(channel); if (desc != NULL) { @@ -1347,6 +1350,9 @@ void netvsc_channel_cb(void *context) bufferlen = bytes_recvd; } + + init_cached_read_index(channel); + } while (1); if (bufferlen > NETVSC_PACKET_SIZE) |