diff options
| author | David S. Miller <davem@davemloft.net> | 2016-04-26 12:00:50 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-26 12:00:50 -0400 |
| commit | 9c9f261d6e3b1084816e9e2df794a55df16e7387 (patch) | |
| tree | 96d3d6f4024f7a79010bea763f5922315d7bd63f /include/net | |
| parent | fab7b629a82da1b59620470d13152aff975239f6 (diff) | |
| parent | 9854518ea04db33738602d45ebc96a200e6f5198 (diff) | |
| download | linux-9c9f261d6e3b1084816e9e2df794a55df16e7387.tar.bz2 | |
Merge branch 'nla_align-set-4'
Nicolas Dichtel says:
====================
netlink: align attributes when needed (patchset #3)
This is the continuation (series #3) of the work done to align netlink
attributes when these attributes contain some 64-bit fields.
It's the last patchset from what I've seen.
The last user of nla_put_u64() is block/drbd. This module does not use
standard netlink API (see all the stuff in include/linux/genl_magic_struct.h
and include/linux/genl_magic_func.h). I didn't modify it because it's seems
hard to do it whithout testing and fully understanding the context (for
example, why include/linux/drbd_genl.h is not part of uapi?).
Any thoughts?
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/gen_stats.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/net/gen_stats.h b/include/net/gen_stats.h index cbafa3768d48..610cd397890e 100644 --- a/include/net/gen_stats.h +++ b/include/net/gen_stats.h @@ -19,17 +19,19 @@ struct gnet_dump { /* Backward compatibility */ int compat_tc_stats; int compat_xstats; + int padattr; void * xstats; int xstats_len; struct tc_stats tc_stats; }; int gnet_stats_start_copy(struct sk_buff *skb, int type, spinlock_t *lock, - struct gnet_dump *d); + struct gnet_dump *d, int padattr); int gnet_stats_start_copy_compat(struct sk_buff *skb, int type, int tc_stats_type, int xstats_type, - spinlock_t *lock, struct gnet_dump *d); + spinlock_t *lock, struct gnet_dump *d, + int padattr); int gnet_stats_copy_basic(struct gnet_dump *d, struct gnet_stats_basic_cpu __percpu *cpu, |