From: Lei Xia <lxia@northwestern.edu>
Date: Thu, 3 Nov 2011 16:31:11 +0000 (-0500)
Subject: Minor Fix for NE2000 and RTL8139 Compile error due to interface change
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=632d708d4dc0ffa441450364c176b14285db3b08;p=palacios-OLD.git

Minor Fix for NE2000 and RTL8139 Compile error due to interface change
---

diff --git a/palacios/src/devices/ne2k.c b/palacios/src/devices/ne2k.c
index ad0bda8..8eda4a4 100644
--- a/palacios/src/devices/ne2k.c
+++ b/palacios/src/devices/ne2k.c
@@ -337,8 +337,6 @@ static int ne2k_update_irq(struct ne2k_state * nic_state) {
 	    v3_pci_raise_irq(nic_state->pci_bus, 0, nic_state->pci_dev);
        }
 
-       nic_state->statistics.interrupts ++;
-
        PrintDebug("NE2000: Raise IRQ\n");
     }
 
@@ -1176,10 +1174,8 @@ static int connect_fn(struct v3_vm_info * info,
 
     ops->recv = ne2k_rx;
     ops->poll = NULL;
-    ops->start_tx = NULL;
-    ops->stop_tx = NULL;
-    ops->frontend_data = nic_state;
-    memcpy(ops->fnt_mac, nic_state->mac, ETH_ALEN);
+    ops->config.frontend_data = nic_state;
+    memcpy(ops->config.fnt_mac, nic_state->mac, ETH_ALEN);
 
     return 0;
 }
diff --git a/palacios/src/devices/rtl8139.c b/palacios/src/devices/rtl8139.c
index 4ef93df..069f79d 100644
--- a/palacios/src/devices/rtl8139.c
+++ b/palacios/src/devices/rtl8139.c
@@ -583,7 +583,6 @@ static inline void rtl8139_update_irq(struct rtl8139_state * nic_state) {
 
     if(isr & 0xffff){
 	v3_pci_raise_irq(nic_state->pci_bus, 0, nic_state->pci_dev);
-	nic_state->statistic.interrupts ++;
     }
 }
 
@@ -1774,10 +1773,8 @@ static int connect_fn(struct v3_vm_info * info,
 
     ops->recv = rtl8139_rx;
     ops->poll = NULL;
-    ops->start_tx = NULL;
-    ops->stop_tx = NULL;
-    ops->frontend_data = nic_state;
-    memcpy(ops->fnt_mac, nic_state->mac, ETH_ALEN);
+    ops->config.frontend_data = nic_state;
+    memcpy(ops->config.fnt_mac, nic_state->mac, ETH_ALEN);
 
     return 0;
 }