diff options
author | Takashi Iwai | 2016-07-02 10:50:45 +0200 |
---|---|---|
committer | Takashi Iwai | 2016-07-02 10:50:45 +0200 |
commit | 046e9ceefab985a137fbd15b946497a88e5a6513 (patch) | |
tree | 29cb2fd3a2783afacc7901f3310bea7a02f84140 /net/core/gen_stats.c | |
parent | ALSA: au88x0: Fix calculation in vortex_wtdma_bufshift() (diff) | |
parent | Merge remote-tracking branches 'asoc/fix/rcar', 'asoc/fix/rt5670' and 'asoc/f... (diff) | |
download | kernel-qcow2-linux-046e9ceefab985a137fbd15b946497a88e5a6513.tar.gz kernel-qcow2-linux-046e9ceefab985a137fbd15b946497a88e5a6513.tar.xz kernel-qcow2-linux-046e9ceefab985a137fbd15b946497a88e5a6513.zip |
Merge tag 'asoc-fix-v4.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.7
A small clutch of hardware specific fixes for various ASoC devices, all
small individually and important if you have that device but not
otherwise.
Diffstat (limited to 'net/core/gen_stats.c')
-rw-r--r-- | net/core/gen_stats.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/core/gen_stats.c b/net/core/gen_stats.c index f96ee8b9478d..be873e4e3125 100644 --- a/net/core/gen_stats.c +++ b/net/core/gen_stats.c @@ -47,6 +47,7 @@ nla_put_failure: * @xstats_type: TLV type for backward compatibility xstats TLV * @lock: statistics lock * @d: dumping handle + * @padattr: padding attribute * * Initializes the dumping handle, grabs the statistic lock and appends * an empty TLV header to the socket buffer for use a container for all @@ -87,6 +88,7 @@ EXPORT_SYMBOL(gnet_stats_start_copy_compat); * @type: TLV type for top level statistic TLV * @lock: statistics lock * @d: dumping handle + * @padattr: padding attribute * * Initializes the dumping handle, grabs the statistic lock and appends * an empty TLV header to the socket buffer for use a container for all |