Merge tag 'char-misc-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char/misc driver updates from Greg KH:
 "Here is the big char/misc driver patchset for 4.11-rc1.

  Lots of different driver subsystems updated here: rework for the
  hyperv subsystem to handle new platforms better, mei and w1 and extcon
  driver updates, as well as a number of other "minor" driver updates.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'char-misc-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (169 commits)
  goldfish: Sanitize the broken interrupt handler
  x86/platform/goldfish: Prevent unconditional loading
  vmbus: replace modulus operation with subtraction
  vmbus: constify parameters where possible
  vmbus: expose hv_begin/end_read
  vmbus: remove conditional locking of vmbus_write
  vmbus: add direct isr callback mode
  vmbus: change to per channel tasklet
  vmbus: put related per-cpu variable together
  vmbus: callback is in softirq not workqueue
  binder: Add support for file-descriptor arrays
  binder: Add support for scatter-gather
  binder: Add extra size to allocator
  binder: Refactor binder_transact()
  binder: Support multiple /dev instances
  binder: Deal with contexts in debugfs
  binder: Support multiple context managers
  binder: Split flat_binder_object
  auxdisplay: ht16k33: remove private workqueue
  auxdisplay: ht16k33: rework input device initialization
  ...

1 files changed, 3 insertions, 18 deletions

diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
index fd6ebbefd919..d35ebd993b38 100644
--- a/drivers/net/hyperv/netvsc.c
+++ b/drivers/net/hyperv/netvsc.c
@@ -703,8 +703,6 @@ static u32 netvsc_copy_to_send_buf(struct netvsc_device *net_device,
         char *dest = start + (section_index * net_device->send_section_size)
                      + pend_size;
         int i;
-        bool is_data_pkt = (skb != NULL) ? true : false;
-        bool xmit_more = (skb != NULL) ? skb->xmit_more : false;
         u32 msg_size = 0;
         u32 padding = 0;
         u32 remain = packet->total_data_buflen % net_device->pkt_align;
@@ -712,7 +710,7 @@ static u32 netvsc_copy_to_send_buf(struct netvsc_device *net_device,
                 packet->page_buf_cnt;
 
         /* Add padding */
-        if (is_data_pkt && xmit_more && remain &&
+        if (skb && skb->xmit_more && remain &&
             !packet->cp_partial) {
                 padding = net_device->pkt_align - remain;
                 rndis_msg->msg_len += padding;
@@ -754,7 +752,6 @@ static inline int netvsc_send_pkt(
         int ret;
         struct hv_page_buffer *pgbuf;
         u32 ring_avail = hv_ringbuf_avail_percent(&out_channel->outbound);
-        bool xmit_more = (skb != NULL) ? skb->xmit_more : false;
 
         nvmsg.hdr.msg_type = NVSP_MSG1_TYPE_SEND_RNDIS_PKT;
         if (skb != NULL) {
@@ -778,16 +775,6 @@ static inline int netvsc_send_pkt(
         if (out_channel->rescind)
                 return -ENODEV;
 
-        /*
-         * It is possible that once we successfully place this packet
-         * on the ringbuffer, we may stop the queue. In that case, we want
-         * to notify the host independent of the xmit_more flag. We don't
-         * need to be precise here; in the worst case we may signal the host
-         * unnecessarily.
-         */
-        if (ring_avail < (RING_AVAIL_PERCENT_LOWATER + 1))
-                xmit_more = false;
-
         if (packet->page_buf_cnt) {
                 pgbuf = packet->cp_partial ? (*pb) +
                         packet->rmsg_pgcnt : (*pb);
@@ -797,15 +784,13 @@ static inline int netvsc_send_pkt(
                                                       &nvmsg,
                                                       sizeof(struct nvsp_message),
                                                       req_id,
-                                                      VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED,
-                                                      !xmit_more);
+                                                      VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
         } else {
                 ret = vmbus_sendpacket_ctl(out_channel, &nvmsg,
                                            sizeof(struct nvsp_message),
                                            req_id,
                                            VM_PKT_DATA_INBAND,
-                                           VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED,
-                                           !xmit_more);
+                                           VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
         }
 
         if (ret == 0) {