diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2025-03-16 12:02:46 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2025-03-16 12:02:46 +1100 |
| commit | ff443fb402e95f5095dde3c64f7c3249d7c6f993 (patch) | |
| tree | fac700d27838ff41a7308dc217551253a1e2b0df /include/net | |
| parent | 772ba9b5bd2701a9967c084b66ff1daaee0367eb (diff) | |
| parent | eff2eb592efd73f00590d578c3d6021f604df62c (diff) | |
| download | linux-ff443fb402e95f5095dde3c64f7c3249d7c6f993.tar.gz linux-ff443fb402e95f5095dde3c64f7c3249d7c6f993.zip | |
Merge branch 'fixes' into topic/cxl
Merge our fixes branch to bring in the changes to the CXL documentation that
the CXL removal patch depends on.
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/sch_generic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index d635c5b47eba..d48c657191cd 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -851,7 +851,7 @@ static inline int qdisc_enqueue(struct sk_buff *skb, struct Qdisc *sch, } static inline void _bstats_update(struct gnet_stats_basic_sync *bstats, - __u64 bytes, __u32 packets) + __u64 bytes, __u64 packets) { u64_stats_update_begin(&bstats->syncp); u64_stats_add(&bstats->bytes, bytes); |