Changes in uspace/drv/nic/virtio-net/virtio-net.c [8fed3ef:09ab0a9a] in mainline

File:

• uspace/drv/nic/virtio-net/virtio-net.c (modified) (5 diffs)

uspace/drv/nic/virtio-net/virtio-net.c

@@ -211 +211 @@
                 ddf_msg(LVL_NOTE, "Unsupported number of virtqueues: %u",
                     num_queues);
-                rc = ELIMIT;
                 goto fail;
         }
@@ -343 +342 @@
         assert(descno < TX_BUFFERS);
 
-        /* Setup the packet header */
+        /* Setup the packed header */
         virtio_net_hdr_t *hdr = (virtio_net_hdr_t *) virtio_net->tx_buf[descno];
         memset(hdr, 0, sizeof(virtio_net_hdr_t));
         hdr->gso_type = VIRTIO_NET_HDR_GSO_NONE;
-        hdr->num_buffers = 0;
 
         /* Copy packet data into the buffer just past the header */
@@ -405 +403 @@
         if (fun == NULL) {
                 rc = ENOMEM;
-                goto uninitialize;
+                goto error;
         }
         nic_t *nic = ddf_dev_data_get(dev);
@@ -419 +417 @@
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed binding device function");
-                goto destroy;
+                goto uninitialize;
         }
 
@@ -435 +433 @@
 unbind:
         ddf_fun_unbind(fun);
-destroy:
-        ddf_fun_destroy(fun);
 uninitialize:
         virtio_net_uninitialize(dev);
+error:
         return rc;
 }