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

File:

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

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

@@ -70 +70 @@
 };
 
-static void virtio_net_irq_handler(ipc_call_t *icall, ddf_dev_t *dev)
-{
-        nic_t *nic = ddf_dev_data_get(dev);
+/** VirtIO net IRQ handler.
+ *
+ * @param icall IRQ event notification
+ * @param arg Argument (nic_t *)
+ */
+static void virtio_net_irq_handler(ipc_call_t *icall, void *arg)
+{
+        nic_t *nic = (nic_t *)arg;
         virtio_net_t *virtio_net = nic_get_specific(nic);
         virtio_dev_t *vdev = &virtio_net->virtio_dev;
@@ -164 +169 @@
 
         return register_interrupt_handler(dev, virtio_net->irq,
-            virtio_net_irq_handler, &irq_code, &virtio_net->irq_handle);
+            virtio_net_irq_handler, (void *)nic, &irq_code,
+            &virtio_net->irq_handle);
 }
 
@@ -215 +221 @@
         }
 
-        vdev->queues = calloc(sizeof(virtq_t), num_queues);
+        vdev->queues = calloc(num_queues, sizeof(virtq_t));
         if (!vdev->queues) {
                 rc = ENOMEM;