A minor fix for VNET

[palacios.git] / palacios / include / palacios / vmm_ethernet.h

diff --git a/palacios/include/palacios/vmm_ethernet.h b/palacios/include/palacios/vmm_ethernet.h
index 06dde7b..c4725a9 100644 (file)
--- a/palacios/include/palacios/vmm_ethernet.h
+++ b/palacios/include/palacios/vmm_ethernet.h
@@ -20,28 +20,50 @@
 #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 65536
 
-#ifdef __V3VEE__
+#define MAX_PACKET_LEN (MAX_MTU + ETHERNET_HEADER_LEN)
 
-#include <palacios/vmm.h>
+#ifdef V3_CONFIG_VNET
+extern int net_debug;
+#endif
 
 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 interrupts;
+    uint32_t tx_interrupts;
+    uint32_t rx_interrupts;
 };
-    
+
+#ifdef __V3VEE__
+
+#include <palacios/vmm.h>
+
+#define V3_Net_Print(level, fmt, args...)                                      \
+    do {                                                               \
+       if(level <= net_debug) {   \
+           extern struct v3_os_hooks * os_hooks;                       \
+           if ((os_hooks) && (os_hooks)->print) {                      \
+               (os_hooks)->print((fmt), ##args);                       \
+           }                                                   \
+       }                                                       \
+    } while (0)        
+
+
 static inline int is_multicast_ethaddr(const uint8_t * addr)
 {
     V3_ASSERT(ETH_ALEN == 6);