[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20110427203730.GH19708@electric-eye.fr.zoreil.com>
Date: Wed, 27 Apr 2011 22:37:30 +0200
From: Francois Romieu <romieu@...zoreil.com>
To: netdev@...r.kernel.org
Cc: Ciprian Docan <docan@...n.rutgers.edu>,
Fejes József <fejes@...o.name>,
Borislav Petkov <borislav.petkov@....com>,
Realtek linux nic maintainers <nic_swsd@...ltek.com>,
Ben Hutchings <ben@...adent.org.uk>
Subject: [PATCH rfc 5/5] r8169: provide some firmware information via ethtool.
There is no real firmware version yet but the manpage of ethtool
is rather terse about the driver information.
Signed-off-by: Francois Romieu <romieu@...zoreil.com>
Cc: Ciprian Docan <docan@...n.rutgers.edu>
Cc: Fejes József <fejes@...o.name>
Cc: Borislav Petkov <borislav.petkov@....com>
Cc: Realtek linux nic maintainers <nic_swsd@...ltek.com>
---
drivers/net/r8169.c | 45 +++++++++++++++++++++++++--------------------
1 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 2606a20..76e81ac 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -1190,6 +1190,19 @@ static int rtl8169_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
return 0;
}
+static const char *rtl_lookup_firmware_name(struct rtl8169_private *tp)
+{
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(rtl_firmware_infos); i++) {
+ const struct rtl_firmware_info *info = rtl_firmware_infos + i;
+
+ if (info->mac_version == tp->mac_version)
+ return info->fw_name;
+ }
+ return NULL;
+}
+
static void rtl8169_get_drvinfo(struct net_device *dev,
struct ethtool_drvinfo *info)
{
@@ -1198,6 +1211,8 @@ static void rtl8169_get_drvinfo(struct net_device *dev,
strcpy(info->driver, MODULENAME);
strcpy(info->version, RTL8169_VERSION);
strcpy(info->bus_info, pci_name(tp->pci_dev));
+ strncpy(info->fw_version, IS_ERR_OR_NULL(tp->fw) ? "N/A" :
+ rtl_lookup_firmware_name(tp), sizeof(info->fw_version));
}
static int rtl8169_get_regs_len(struct net_device *dev)
@@ -3502,33 +3517,23 @@ static void __devexit rtl8169_remove_one(struct pci_dev *pdev)
static void rtl_request_firmware(struct rtl8169_private *tp)
{
- int i;
-
/* Return early if the firmware is already loaded / cached. */
- if (!IS_ERR(tp->fw))
- goto out;
-
- for (i = 0; i < ARRAY_SIZE(rtl_firmware_infos); i++) {
- const struct rtl_firmware_info *info = rtl_firmware_infos + i;
+ if (IS_ERR(tp->fw)) {
+ const char *name;
- if (info->mac_version == tp->mac_version) {
- const char *name = info->fw_name;
+ name = rtl_lookup_firmware_name(tp);
+ if (name) {
int rc;
rc = request_firmware(&tp->fw, name, &tp->pci_dev->dev);
- if (rc < 0) {
- netif_warn(tp, ifup, tp->dev, "unable to load "
- "firmware patch %s (%d)\n", name, rc);
- goto out_disable_request_firmware;
- }
- goto out;
+ if (rc >= 0)
+ return;
+
+ netif_warn(tp, ifup, tp->dev, "unable to load "
+ "firmware patch %s (%d)\n", name, rc);
}
+ tp->fw = NULL;
}
-
-out_disable_request_firmware:
- tp->fw = NULL;
-out:
- return;
}
static int rtl8169_open(struct net_device *dev)
--
1.7.4.4
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists