diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-06-12 17:12:49 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-06-12 17:12:49 -0400 |
| commit | 9cadcd28f05e1957a8f61ae726fce31d0b29a3f9 (patch) | |
| tree | 2acece0d3df7002c8d7650e4561302191c200c2b /net/wireless/sysfs.c | |
| parent | b7e773b869f49bbd69e9dad76b34d3552627fac5 (diff) | |
| parent | 14042cbefce4af12f7ca35d2604686154d803291 (diff) | |
Merge branch 'mac80211-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/wireless/sysfs.c')
| -rw-r--r-- | net/wireless/sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/sysfs.c b/net/wireless/sysfs.c index 3ebae1442963..88aaacd9f822 100644 --- a/net/wireless/sysfs.c +++ b/net/wireless/sysfs.c | |||
| @@ -33,7 +33,7 @@ static ssize_t _show_permaddr(struct device *dev, | |||
| 33 | struct device_attribute *attr, | 33 | struct device_attribute *attr, |
| 34 | char *buf) | 34 | char *buf) |
| 35 | { | 35 | { |
| 36 | char *addr = dev_to_rdev(dev)->wiphy.perm_addr; | 36 | unsigned char *addr = dev_to_rdev(dev)->wiphy.perm_addr; |
| 37 | 37 | ||
| 38 | return sprintf(buf, "%.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n", | 38 | return sprintf(buf, "%.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n", |
| 39 | addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]); | 39 | addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]); |