Changeset 7

Timestamp:

Jan 26, 2011, 10:00:13 PM (14 years ago)

Author:

David Azarewicz

Message:

Added NETADDRESS support to E1000E

Location:

trunk

Files:

• e1000e/e1000e.inc (modified) (1 diff)
• e1000e/e1000e.nif-in (modified) (1 diff)
• e1000e/e1000hw.cpp (modified) (3 diffs)
• e1000e/readme (modified) (1 diff)
• nveth/readme (modified) (1 diff)

trunk/e1000e/e1000e.inc ¶

@@ -2 +2 @@
 #commas are not allowed in these definitions
 PROJECT=Intel PRO/1000 PCIe MAC Driver
-FIXPACK=SVN4
-VERSION=0.1.4
+FIXPACK=SVN7
+VERSION=0.1.5
 
 #TODO: automatically create BUILDDATE
-BUILDDATE=20101129
+BUILDDATE=20110126
 
 #DBG_MODE=0 turns debug off

trunk/e1000e/e1000e.nif-in ¶

@@ -28 +28 @@
 Editable   = yes
 Help       = "Use receive chain instead of receive lookahead"
+
+[NETADDRESS]
+Display    = "Network Adapter Address"
+Type       = hexstring
+Strlength  = 12
+Optional   = yes
+Editable   = yes
+Help       = "This parameter overrides the network address of the network
+ adapter card.  The value of this parameter is a hexadecimal string of
+ 12 digits.  The address must be unique among all other network adapter addresses on the network."

trunk/e1000e/e1000hw.cpp ¶

@@ -34 +34 @@
 word fixed_mode = 0;
 word dorxchain = 1;
+word use_hw_netaddress = 1;
 
 static void set_default_params(struct e1000_adapter *adapter);
@@ -384 +385 @@
         }
 
+        p = GetConfigString(FindKey(pConfig, "NETADDRESS"));
+        if (*p) {
+                rc = GetHex(p, mac, 6, 0);
+                use_hw_netaddress = 0;
+        }
+
         if (dorxchain) AdapterSC.MscService |= RECEIVECHAIN_MOSTLY;
 
@@ -526 +533 @@
         e1000_eeprom_checks(&adapter);
 
-        /* copy the MAC address out of the NVM */
-        if (e1000e_read_mac_addr(&adapter.hw))
-        {
-                DPRINTF((1, "NVM Read Error while reading MAC address"));
-                return -1;
-        }
-
-        memcpy(mac, adapter.hw.mac.addr, sizeof mac);
+        if (use_hw_netaddress) {
+                /* copy the MAC address out of the NVM */
+                if (e1000e_read_mac_addr(&adapter.hw))
+                {
+                        DPRINTF((1, "NVM Read Error while reading MAC address"));
+                        return -1;
+                }
+
+                memcpy(mac, adapter.hw.mac.addr, sizeof mac);
+        }
 
         DPRINTF((3, "MAC address = %x:%x:%x:%x:%x:%x", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]));

trunk/e1000e/readme ¶

@@ -81 +81 @@
   not output normal messages. Error messages are still output normally.
 
+0.1.5
+  Added NETADDRESS support
 

trunk/nveth/readme ¶

@@ -128 +128 @@
   not output normal messages. Error messages are still output normally.
 
+0.1.6
+  Added NETADDRESS support
+