From 26ead354db6569e67398d83cba70de40bb52dc02 Mon Sep 17 00:00:00 2001
From: Ben Greear <greearb@candelatech.com>
Date: Mon, 11 Oct 2010 10:28:59 -0700
Subject: [PATCH] --- yaml --- r: 215331 b: refs/heads/master c:
 cfd8e12f42746df396ecbdf7a1d8e92e8e4dbb97 h: refs/heads/master i:   215329:
 742edb6f7c9e66a214882b8794eaa9424afc84c4   215327:
 b93d9980c77034afe414294d140e0b70cdc3dc46 v: v3

---
 [refs]                     | 2 +-
 trunk/net/wireless/sysfs.c | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 034f48eb98c5..be4be350051e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5807bae7eda2d6da673c9f9f52460c3fbcea556c
+refs/heads/master: cfd8e12f42746df396ecbdf7a1d8e92e8e4dbb97
diff --git a/trunk/net/wireless/sysfs.c b/trunk/net/wireless/sysfs.c
index 74a9e3cce452..4294fa22bb2d 100644
--- a/trunk/net/wireless/sysfs.c
+++ b/trunk/net/wireless/sysfs.c
@@ -35,6 +35,14 @@ SHOW_FMT(index, "%d", wiphy_idx);
 SHOW_FMT(macaddress, "%pM", wiphy.perm_addr);
 SHOW_FMT(address_mask, "%pM", wiphy.addr_mask);
 
+static ssize_t name_show(struct device *dev,
+			 struct device_attribute *attr,
+			 char *buf) {
+	struct wiphy *wiphy = &dev_to_rdev(dev)->wiphy;
+	return sprintf(buf, "%s\n", dev_name(&wiphy->dev));
+}
+
+
 static ssize_t addresses_show(struct device *dev,
 			      struct device_attribute *attr,
 			      char *buf)
@@ -57,6 +65,7 @@ static struct device_attribute ieee80211_dev_attrs[] = {
 	__ATTR_RO(macaddress),
 	__ATTR_RO(address_mask),
 	__ATTR_RO(addresses),
+	__ATTR_RO(name),
 	{}
 };