diff -u linux-2.6.18-rc7/drivers/net/netxen/netxen_nic_ethtool.c linux-2.6.18-rc7/drivers/net/netxen/netxen_nic_ethtool.c --- linux-2.6.18-rc7/drivers/net/netxen/netxen_nic_ethtool.c 2006-09-15 10:51:59.000000000 -0700 +++ linux-2.6.18-rc7/drivers/net/netxen/netxen_nic_ethtool.c 2006-09-19 07:51:20.000000000 -0700 @@ -115,7 +115,7 @@ uint32_t fw_minor = 0; uint32_t fw_build = 0;
- strncpy(drvinfo->driver, "NetXen", 32); + strncpy(drvinfo->driver, "netxen_nic", 32); strncpy(drvinfo->version, NETXEN_NIC_LINUX_VERSIONID, 32); fw_major = readl(NETXEN_CRB_NORMALIZE(adapter, NETXEN_FW_VERSION_MAJOR)); @@ -551,7 +551,7 @@ return 0; } - /* netxen_niu_gb_mii_mgmt_indicators_t is read only */ + /* netxen_niu_gb_mii_mgmt_indicators is read only */ netxen_nic_read_w0(adapter, NETXEN_NIU_GB_MII_MGMT_INDICATE(port-> portnum), @@ -579,7 +579,7 @@ return 0; } - /* netxen_niu_gb_interface_status_t is read only */ + /* netxen_niu_gb_interface_status is read only */ netxen_nic_read_w0(adapter, NETXEN_NIU_GB_INTERFACE_STATUS(port-> portnum), - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html