diff options
| author | David S. Miller <davem@davemloft.net> | 2016-09-19 05:29:08 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-09-19 05:29:08 +0300 |
| commit | c13ed534b8db543e4d8ead3885f4b06585a5771c (patch) | |
| tree | b371024a63efe057e0bed95fc5ed77900b113e7d /net/wireless/sysfs.c | |
| parent | 22da73492541736eff5f6a6634c732e36c52a133 (diff) | |
| parent | fbd05e4a6e82fd573d3aa79e284e424b8d78c149 (diff) | |
| download | linux-c13ed534b8db543e4d8ead3885f4b06585a5771c.tar.xz | |
Merge tag 'mac80211-next-for-davem-2016-09-16' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
This time we have various things - all across the board:
* MU-MIMO sniffer support in mac80211
* a create_singlethread_workqueue() cleanup
* interface dump filtering that was documented but not implemented
* support for the new radiotap timestamp field
* send delBA in two unexpected conditions (as required by the spec)
* connect keys cleanups - allow only WEP with index 0-3
* per-station aggregation limit to work around broken APs
* debugfs improvement for the integrated codel algorithm
and various other small improvements and cleanups.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
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 e46469bc130f..0082f4b01795 100644 --- a/net/wireless/sysfs.c +++ b/net/wireless/sysfs.c @@ -57,7 +57,7 @@ static ssize_t addresses_show(struct device *dev, return sprintf(buf, "%pM\n", wiphy->perm_addr); for (i = 0; i < wiphy->n_addresses; i++) - buf += sprintf(buf, "%pM\n", &wiphy->addresses[i].addr); + buf += sprintf(buf, "%pM\n", wiphy->addresses[i].addr); return buf - start; } |