diff options
| author | Eric Dumazet <edumazet@google.com> | 2019-11-05 06:13:13 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-11-06 05:20:55 +0300 |
| commit | 4d390c287b2f3fbd0bb64c52c1a9418f790986e1 (patch) | |
| tree | 0a556c6190faad6b6f69cc8895da811a5c8175c4 /include | |
| parent | 973ff55bef3899dec111248b4a71f84aa4ac05ef (diff) | |
| download | linux-4d390c287b2f3fbd0bb64c52c1a9418f790986e1.tar.xz | |
net_sched: do not export gnet_stats_basic_packed to uapi
gnet_stats_basic_packed was really meant to be private kernel structure.
If this proves to be a problem, we will have to rename the in-kernel
version.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/gen_stats.h | 6 | ||||
| -rw-r--r-- | include/uapi/linux/gen_stats.h | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/net/gen_stats.h b/include/net/gen_stats.h index ca23860adbb9..5f3889e7ec1b 100644 --- a/include/net/gen_stats.h +++ b/include/net/gen_stats.h @@ -7,6 +7,12 @@ #include <linux/rtnetlink.h> #include <linux/pkt_sched.h> +/* Note: this used to be in include/uapi/linux/gen_stats.h */ +struct gnet_stats_basic_packed { + __u64 bytes; + __u32 packets; +} __attribute__ ((packed)); + struct gnet_stats_basic_cpu { struct gnet_stats_basic_packed bstats; struct u64_stats_sync syncp; diff --git a/include/uapi/linux/gen_stats.h b/include/uapi/linux/gen_stats.h index 065408e16a80..4eaacdf452e3 100644 --- a/include/uapi/linux/gen_stats.h +++ b/include/uapi/linux/gen_stats.h @@ -26,10 +26,6 @@ struct gnet_stats_basic { __u64 bytes; __u32 packets; }; -struct gnet_stats_basic_packed { - __u64 bytes; - __u32 packets; -} __attribute__ ((packed)); /** * struct gnet_stats_rate_est - rate estimator |