diff options
| author | David S. Miller <davem@davemloft.net> | 2018-01-22 09:36:37 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-22 09:36:37 -0500 |
| commit | 291040cd7e8368a38ae6624f457c39827c55c7f8 (patch) | |
| tree | 1c2f9a6cc47711884913dd420fa42d15efb6ccaf /net | |
| parent | b75703de16301b80f1eedecafdf37bb02c9e155f (diff) | |
| parent | 0ddcff49b672239dda94d70d0fcf50317a9f4b51 (diff) | |
| download | linux-stable-291040cd7e8368a38ae6624f457c39827c55c7f8.tar.gz linux-stable-291040cd7e8368a38ae6624f457c39827c55c7f8.tar.bz2 linux-stable-291040cd7e8368a38ae6624f457c39827c55c7f8.zip | |
Merge tag 'mac80211-next-for-davem-2018-01-22' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
Less than a handful of changes:
* possible memory leak fix in hwsim
* speed up hwsim
* add hwsim userspace rate control API
* code cleanups
====================
A conflict was resolved in mac80211_hwsim.c, mostly of
the simple overlapping changes category. One adding
a rhashtable and another adding a workqueue.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/debugfs_sta.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c index b15412c21ac9..444ea8d127fe 100644 --- a/net/mac80211/debugfs_sta.c +++ b/net/mac80211/debugfs_sta.c @@ -420,7 +420,7 @@ static ssize_t sta_vht_capa_read(struct file *file, char __user *userbuf, default: p += scnprintf(p, sizeof(buf) + buf - p, "\t\tMAX-MPDU-UNKNOWN\n"); - }; + } switch (vhtc->cap & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK) { case 0: p += scnprintf(p, sizeof(buf) + buf - p, @@ -438,7 +438,7 @@ static ssize_t sta_vht_capa_read(struct file *file, char __user *userbuf, p += scnprintf(p, sizeof(buf) + buf - p, "\t\tUNKNOWN-MHZ: 0x%x\n", (vhtc->cap >> 2) & 0x3); - }; + } PFLAG(RXLDPC, "RXLDPC"); PFLAG(SHORT_GI_80, "SHORT-GI-80"); PFLAG(SHORT_GI_160, "SHORT-GI-160"); |