Changeset ab936440 in mainline for uspace/drv/nic/virtio-net/virtio-net.c

Timestamp:

2019-02-12T20:42:42Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f31ca47

Parents:

7f7817a9 (diff), 4805495 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)

Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

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;
         }
@@ -342 +343 @@
         assert(descno < TX_BUFFERS);
 
-        /* Setup the packed header */
+        /* Setup the packet 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 */
@@ -403 +405 @@
         if (fun == NULL) {
                 rc = ENOMEM;
-                goto error;
+                goto uninitialize;
         }
         nic_t *nic = ddf_dev_data_get(dev);
@@ -417 +419 @@
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed binding device function");
-                goto uninitialize;
+                goto destroy;
         }
 
@@ -433 +435 @@
 unbind:
         ddf_fun_unbind(fun);
+destroy:
+        ddf_fun_destroy(fun);
 uninitialize:
         virtio_net_uninitialize(dev);
-error:
         return rc;
 }