hv_netvsc: remove excessive logging on MTU change

[mirror_ubuntu-bionic-kernel.git] / drivers / net / hyperv / netvsc.c

diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
index 720b5fa9e6254463ce0dde094d6b71afd7e7684d..5a1cc089acb7fd2e79c18876cd7951f6dfb6e747 100644 (file)
--- a/drivers/net/hyperv/netvsc.c
+++ b/drivers/net/hyperv/netvsc.c
@@ -410,8 +410,8 @@ static int netvsc_init_buf(struct hv_device *device)
        net_device->send_section_cnt =
                net_device->send_buf_size / net_device->send_section_size;
 
-       dev_info(&device->device, "Send section size: %d, Section count:%d\n",
-                net_device->send_section_size, net_device->send_section_cnt);
+       netdev_dbg(ndev, "Send section size: %d, Section count:%d\n",
+                  net_device->send_section_size, net_device->send_section_cnt);
 
        /* Setup state for managing the send buffer. */
        net_device->map_words = DIV_ROUND_UP(net_device->send_section_cnt,
@@ -578,7 +578,7 @@ void netvsc_device_remove(struct hv_device *device)
         * At this point, no one should be accessing net_device
         * except in here
         */
-       dev_notice(&device->device, "net device safe to remove\n");
+       netdev_dbg(ndev, "net device safe to remove\n");
 
        /* Now, we can close the channel safely */
        vmbus_close(device->channel);
@@ -888,6 +888,13 @@ int netvsc_send(struct hv_device *device,
        if (!net_device)
                return -ENODEV;
 
+       /* We may race with netvsc_connect_vsp()/netvsc_init_buf() and get
+        * here before the negotiation with the host is finished and
+        * send_section_map may not be allocated yet.
+        */
+       if (!net_device->send_section_map)
+               return -EAGAIN;
+
        out_channel = net_device->chn_table[q_idx];
 
        packet->send_buf_index = NETVSC_INVALID_INDEX;
@@ -1380,7 +1387,7 @@ int netvsc_device_add(struct hv_device *device, void *additional_info)
        }
 
        /* Channel is opened */
-       pr_info("hv_netvsc channel opened successfully\n");
+       netdev_dbg(ndev, "hv_netvsc channel opened successfully\n");
 
        /* If we're reopening the device we may have multiple queues, fill the
         * chn_table with the default channel to use it before subchannels are