From 04858fe39dc47d29ea5fc3c7953818ef9d4d925f Mon Sep 17 00:00:00 2001
From: Tomas Winkler <tomas.winkler@intel.com>
Date: Tue, 6 May 2008 11:05:13 +0800
Subject: [PATCH] --- yaml --- r: 102567 b: refs/heads/master c:
 bc6f59bc9b2f494ca1b018622f1fbd25933bc920 h: refs/heads/master i:   102565:
 2768956e1600ae5ca334ab51928f8d67ac645275   102563:
 e5a02febcdf18204e4b510831b42b22695bfb361   102559:
 a11e72854ae6255514748bee6607285d90729fa8 v: v3

---
 [refs]                                        |  2 +-
 .../net/wireless/iwlwifi/iwl4965-base.c       | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b3303f53ca49..13adc69ea62a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3d67999348776638644fd0035ee465261cc8c68
+refs/heads/master: bc6f59bc9b2f494ca1b018622f1fbd25933bc920
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c b/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c
index 901d9cf9ad78..7708b19ca0cc 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -5993,6 +5993,25 @@ static DEVICE_ATTR(debug_level, S_IWUSR | S_IRUGO,
 #endif /* CONFIG_IWLWIFI_DEBUG */
 
 
+static ssize_t show_version(struct device *d,
+				struct device_attribute *attr, char *buf)
+{
+	struct iwl_priv *priv = d->driver_data;
+	struct iwl4965_alive_resp *palive = &priv->card_alive;
+
+	if (palive->is_valid)
+		return sprintf(buf, "fw version: 0x%01X.0x%01X.0x%01X.0x%01X\n"
+				    "fw type: 0x%01X 0x%01X\n",
+				palive->ucode_major, palive->ucode_minor,
+				palive->sw_rev[0], palive->sw_rev[1],
+				palive->ver_type, palive->ver_subtype);
+
+	else
+		return sprintf(buf, "fw not loaded\n");
+}
+
+static DEVICE_ATTR(version, S_IWUSR | S_IRUGO, show_version, NULL);
+
 static ssize_t show_temperature(struct device *d,
 				struct device_attribute *attr, char *buf)
 {
@@ -6438,6 +6457,7 @@ static struct attribute *iwl4965_sysfs_entries[] = {
 #ifdef CONFIG_IWLWIFI_DEBUG
 	&dev_attr_debug_level.attr,
 #endif
+	&dev_attr_version.attr,
 
 	NULL
 };