X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_ethernet.h;h=c4725a9c84181fa6b3a3aa744f70dbd44ad684eb;hb=926fe574cd42bb860c19fd04610451c24b6d42b6;hp=ca3034bc0b21966312481211b1d2e068d40b0048;hpb=6ed3385440a7d82f4529bb9433d1a5489351c378;p=palacios.git

diff --git a/palacios/include/palacios/vmm_ethernet.h b/palacios/include/palacios/vmm_ethernet.h
index ca3034b..c4725a9 100644
--- a/palacios/include/palacios/vmm_ethernet.h
+++ b/palacios/include/palacios/vmm_ethernet.h
@@ -20,19 +20,34 @@
 #ifndef __ETHERNET_H__
 #define __ETHERNET_H__
 
+#include <palacios/vmm.h>
+
 #define ETHERNET_HEADER_LEN 14
 #define ETHERNET_MTU   1500
 #define ETHERNET_PACKET_LEN (ETHERNET_HEADER_LEN + ETHERNET_MTU)
 #define ETH_ALEN 6
 
 #define MIN_MTU 68
-//#define MAX_MTU 65535
-#define MAX_MTU 9000
+#define MAX_MTU 65536
 
-#define MAX_PACKET_LEN (ETHERNET_HEADER_LEN + MAX_MTU)
+#define MAX_PACKET_LEN (MAX_MTU + ETHERNET_HEADER_LEN)
 
+#ifdef V3_CONFIG_VNET
+extern int net_debug;
+#endif
 
-extern int vnet_debug;
+struct nic_statistics {
+    uint64_t tx_pkts;
+    uint64_t tx_bytes;
+    uint64_t tx_dropped;
+
+    uint64_t rx_pkts;
+    uint64_t rx_bytes;
+    uint64_t rx_dropped;
+
+    uint32_t tx_interrupts;
+    uint32_t rx_interrupts;
+};
 
 #ifdef __V3VEE__
 
@@ -40,7 +55,7 @@ extern int vnet_debug;
 
 #define V3_Net_Print(level, fmt, args...)					\
     do {								\
-	if(level <= vnet_debug) {   \
+	if(level <= net_debug) {   \
 	    extern struct v3_os_hooks * os_hooks;			\
 	    if ((os_hooks) && (os_hooks)->print) {			\
 	    	(os_hooks)->print((fmt), ##args);			\
@@ -48,19 +63,7 @@ extern int vnet_debug;
 	}							\
     } while (0)	
 
-struct nic_statistics {
-    uint64_t tx_pkts;
-    uint64_t tx_bytes;
-    uint64_t tx_dropped;
-	
-    uint64_t rx_pkts;
-    uint64_t rx_bytes;
-    uint64_t rx_dropped;
 
-    uint32_t tx_interrupts;
-    uint32_t rx_interrupts;
-};
-    
 static inline int is_multicast_ethaddr(const uint8_t * addr)
 {
     V3_ASSERT(ETH_ALEN == 6);