diff options
author | Ben Greear <greearb@candelatech.com> | 2010-10-11 19:28:59 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-10-12 22:05:29 +0200 |
commit | cfd8e12f42746df396ecbdf7a1d8e92e8e4dbb97 (patch) | |
tree | 3f393fd50bd7eac0f9bf2d08cc8ce1f059446cde /net/wireless/sysfs.c | |
parent | Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
download | linux-cfd8e12f42746df396ecbdf7a1d8e92e8e4dbb97.tar.xz linux-cfd8e12f42746df396ecbdf7a1d8e92e8e4dbb97.zip |
wireless: Print wiphy name in sysfs.
The index cannot be used to reliably reconstruct a phy
name, so explicitly add the phy name to sysfs so that scripts
can figure out the parent phy device for a particular
wireless interface.
Signed-off-by: Ben Greear <greearb@candelatech.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless/sysfs.c')
-rw-r--r-- | net/wireless/sysfs.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/net/wireless/sysfs.c b/net/wireless/sysfs.c index 74a9e3cce452..4294fa22bb2d 100644 --- a/net/wireless/sysfs.c +++ b/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), {} }; |