set the default base port of ne2000 to -1 to make it able to coexist with other netwo...

[palacios-OLD.git] / palacios / src / devices / ne2k.c

diff --git a/palacios/src/devices/ne2k.c b/palacios/src/devices/ne2k.c
index 8eda4a4..bf80bf5 100644 (file)
--- a/palacios/src/devices/ne2k.c
+++ b/palacios/src/devices/ne2k.c
@@ -323,7 +323,7 @@ struct ne2k_state {
 
     struct nic_statistics statistics;
 
-    struct v3_dev_net_ops *net_ops;
+    struct v3_dev_net_ops * net_ops;
     void * backend_data;
 };
 
@@ -1092,7 +1092,6 @@ static int pci_config_update(uint_t reg_num,
                             void * private_data) {
     PrintDebug("PCI Config Update\n");
 
-    /* Do we need this? */
 
     return 0;
 }
@@ -1113,7 +1112,7 @@ static int register_dev(struct ne2k_state * nic_state)
        }
 
        bars[0].type = PCI_BAR_IO;
-       bars[0].default_base_port = NIC_REG_BASE_PORT;
+       bars[0].default_base_port = -1; // NIC_REG_BASE_PORT;
        bars[0].num_ports = 256;
 
        bars[0].io_read = ne2k_pci_read;
@@ -1175,7 +1174,7 @@ static int connect_fn(struct v3_vm_info * info,
     ops->recv = ne2k_rx;
     ops->poll = NULL;
     ops->config.frontend_data = nic_state;
-    memcpy(ops->config.fnt_mac, nic_state->mac, ETH_ALEN);
+    ops->config.fnt_mac = nic_state->mac;
 
     return 0;
 }