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 6c879dc..2b9319b 100644 (file)
--- a/palacios/include/palacios/vmm_ethernet.h
+++ b/palacios/include/palacios/vmm_ethernet.h
@@ -26,7 +26,8 @@
 #define ETH_ALEN 6
 
 #define MIN_MTU 68
-#define MAX_MTU 65535
+//#define MAX_MTU 65535
+#define MAX_MTU 9000
 
 #define MAX_PACKET_LEN (ETHERNET_HEADER_LEN + MAX_MTU)
 

diff --git a/palacios/src/devices/nic_bridge.c b/palacios/src/devices/nic_bridge.c
index 9bc28d2..5eec5e6 100644 (file)
--- a/palacios/src/devices/nic_bridge.c
+++ b/palacios/src/devices/nic_bridge.c
@@ -36,6 +36,7 @@ struct nic_bridge_state {
 };
 
 static int bridge_send(uint8_t * buf, uint32_t len, 
+                      int synchronize,
                       void * private_data) {
 
 #ifdef CONFIG_DEBUG_NIC_BRIDGE