net/ice/base: change address parameter to 16-bit

[dpdk.git] / drivers / net / virtio / virtio_ethdev.c

diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index 9690eb4..da1633d 100644 (file)
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -632,6 +632,7 @@ free_mz:
        rte_memzone_free(mz);
 free_vq:
        rte_free(vq);
+       hw->vqs[queue_idx] = NULL;
 
        return ret;
 }
@@ -1685,13 +1686,15 @@ virtio_configure_intr(struct rte_eth_dev *dev)
                }
        }
 
-       /* Re-register callback to update max_intr */
-       rte_intr_callback_unregister(dev->intr_handle,
-                                    virtio_interrupt_handler,
-                                    dev);
-       rte_intr_callback_register(dev->intr_handle,
-                                  virtio_interrupt_handler,
-                                  dev);
+       if (dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC) {
+               /* Re-register callback to update max_intr */
+               rte_intr_callback_unregister(dev->intr_handle,
+                                            virtio_interrupt_handler,
+                                            dev);
+               rte_intr_callback_register(dev->intr_handle,
+                                          virtio_interrupt_handler,
+                                          dev);
+       }
 
        /* DO NOT try to remove this! This function will enable msix, or QEMU
         * will encounter SIGSEGV when DRIVER_OK is sent.
@@ -2100,10 +2103,14 @@ virtio_dev_configure(struct rte_eth_dev *dev)
                        return ret;
        }
 
-       if (rxmode->max_rx_pkt_len > hw->max_mtu + ether_hdr_len)
+       if ((rx_offloads & DEV_RX_OFFLOAD_JUMBO_FRAME) &&
+           (rxmode->max_rx_pkt_len > hw->max_mtu + ether_hdr_len))
                req_features &= ~(1ULL << VIRTIO_NET_F_MTU);
 
-       hw->max_rx_pkt_len = rxmode->max_rx_pkt_len;
+       if (rx_offloads & DEV_RX_OFFLOAD_JUMBO_FRAME)
+               hw->max_rx_pkt_len = rxmode->max_rx_pkt_len;
+       else
+               hw->max_rx_pkt_len = ether_hdr_len + dev->data->mtu;
 
        if (rx_offloads & (DEV_RX_OFFLOAD_UDP_CKSUM |
                           DEV_RX_OFFLOAD_TCP_CKSUM))