[netperf-dev] netperf2 commit notice r242 - trunk/src

[raj at netperf.org]

Author: raj
Date: 2008-03-05 17:46:23 -0800 (Wed, 05 Mar 2008)
New Revision: 242

Modified:
   trunk/src/nettest_bsd.h
   trunk/src/nettest_omni.c
Log:
more card info

Modified: trunk/src/nettest_bsd.h
===================================================================
--- trunk/src/nettest_bsd.h	2008-03-06 01:36:32 UTC (rev 241)
+++ trunk/src/nettest_bsd.h	2008-03-06 01:46:23 UTC (rev 242)
@@ -115,7 +115,12 @@
 
   int32_t    peak_cpu_id;   /* ID of the most utilized CPU */
   float      peak_cpu_util; /* its individual utilization */
-  /* this is the 18th 32-bit word and we have 248-(17*4) bytes
+  int32_t    vendor;
+  int32_t    device;        /* pci device id of the probable egress
+			       interface */ 
+  int32_t    subvendor;
+  int32_t    subdevice;
+  /* this is the 22dn 32-bit word and we have 248-(17*4) bytes
      available from here */
   char       ifname[16];    /* the probable egress interface */
   char       driver[32];    /* size based on linux/ethtool.h */
@@ -123,7 +128,7 @@
   char       firmware[32];  
   char       bus[32];
   char       ifslot[16];    /* slot id of the probable egress interface */
-  /* only 20 bytes left... */
+  /* only 4 bytes left... */
 };
 
 #endif /* WANT_OMNI */

Modified: trunk/src/nettest_omni.c
===================================================================
--- trunk/src/nettest_omni.c	2008-03-06 01:36:32 UTC (rev 241)
+++ trunk/src/nettest_omni.c	2008-03-06 01:46:23 UTC (rev 242)
@@ -4333,6 +4333,12 @@
 
     local_interface_slot = find_interface_slot(local_interface_name);
 
+    find_interface_ids(local_interface_name,
+		       &local_interface_vendor,
+		       &local_interface_device,
+		       &local_interface_subvendor,
+		       &local_interface_subdevice);
+
     /* if we timed-out, and had padded the timer, we need to subtract
        the pad_time from the elapsed time on the assumption that we
        were essentially idle for pad_time and just waiting for a timer