Merge branch 'devel' of palacios@newskysaw.cs.northwestern.edu:/home/palacios/palacio...

diff --git a/palacios/include/palacios/vmm_ethernet.h b/palacios/include/palacios/vmm_ethernet.h
index 1fd00ac..dadb775 100644 (file)
--- a/palacios/include/palacios/vmm_ethernet.h
+++ b/palacios/include/palacios/vmm_ethernet.h
@@ -28,10 +28,9 @@
 #define ETH_ALEN 6
 
 #define MIN_MTU 68
-//#define MAX_MTU 65535
-#define MAX_MTU 9000
+#define MAX_MTU 65535
 
-#define MAX_PACKET_LEN (ETHERNET_HEADER_LEN + MAX_MTU)
+#define MAX_PACKET_LEN (MAX_MTU)
 
 #ifdef V3_CONFIG_VNET
 extern int net_debug;

diff --git a/palacios/src/devices/lnx_virtio_nic.c b/palacios/src/devices/lnx_virtio_nic.c
index 7a4eb4a..952cc52 100644 (file)
--- a/palacios/src/devices/lnx_virtio_nic.c
+++ b/palacios/src/devices/lnx_virtio_nic.c
@@ -595,7 +595,7 @@ static int virtio_rx(uint8_t * buf, uint32_t size, void * private_data) {
        uint16_t buf_idx;
        struct vring_desc * buf_desc;
        uint32_t hdr_len, len;
-       uint32_t offset = 0;
+       uint32_t offset = 0;
 
        hdr_len = (virtio->mergeable_rx_bufs)?
            sizeof(struct virtio_net_hdr_mrg_rxbuf):
@@ -935,8 +935,6 @@ static int connect_fn(struct v3_vm_info * info,
     net_state->timer = v3_add_timer(&(info->cores[0]),
                                    &timer_ops,net_state);
 
-    PrintError("net_state 0x%p\n", (void *)net_state);
-
     ops->recv = virtio_rx;
     ops->frontend_data = net_state;
     memcpy(ops->fnt_mac, virtio->mac, ETH_ALEN);