Skip to content

Commit

Permalink
net_sched: do not export gnet_stats_basic_packed to uapi
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Eric Dumazet authored and David S. Miller committed Nov 6, 2019
1 parent 973ff55 commit 4d390c2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
6 changes: 6 additions & 0 deletions include/net/gen_stats.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 0 additions & 4 deletions include/uapi/linux/gen_stats.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4d390c2

Please sign in to comment.