diff options
| author | David S. Miller <davem@davemloft.net> | 2017-02-07 16:29:30 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-07 16:29:30 -0500 |
| commit | 3efa70d78f218e4c9276b0bac0545e5184c1c47b (patch) | |
| tree | f4abe2f05e173023d2a262afd4aebb1e89fe6985 /drivers/net/hyperv | |
| parent | 76e0e70e6452b971a69cc9794ff4a6715c11f7f2 (diff) | |
| parent | 926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the
netvsc driver in 'net' and an optimization of the RX path
in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/hyperv')
| -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 5cfdb1a1b4c1..fd6ebbefd919 100644 --- a/drivers/net/hyperv/netvsc.c +++ b/drivers/net/hyperv/netvsc.c @@ -1254,6 +1254,9 @@ void netvsc_channel_cb(void *context) netvsc_channel_idle(net_device, q_idx)) return; + /* commit_rd_index() -> hv_signal_on_read() needs this. */ + init_cached_read_index(channel); + while ((desc = get_next_pkt_raw(channel)) != NULL) { netvsc_process_raw_pkt(device, channel, net_device, ndev, desc->trans_id, desc); |