diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2021-04-20 10:13:58 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-04-20 10:13:58 +0200 |
| commit | d0d252b8ca7a636640a7dca8606edf7c3bcfe0b8 (patch) | |
| tree | 992b53f3c91669f3597e05997b61fa09db2155df /net/core/skbuff.c | |
| parent | sched/debug: Rename the sched_debug parameter to sched_verbose (diff) | |
| parent | Linux 5.12-rc8 (diff) | |
| download | linux-dev-d0d252b8ca7a636640a7dca8606edf7c3bcfe0b8.tar.xz linux-dev-d0d252b8ca7a636640a7dca8606edf7c3bcfe0b8.zip | |
Merge tag 'v5.12-rc8' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/core/skbuff.c')
| -rw-r--r-- | net/core/skbuff.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 420f23c0f81f..4275b88726f4 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -3660,6 +3660,8 @@ unsigned int skb_find_text(struct sk_buff *skb, unsigned int from, struct ts_state state; unsigned int ret; + BUILD_BUG_ON(sizeof(struct skb_seq_state) > sizeof(state.cb)); + config->get_next_block = skb_ts_get_next_block; config->finish = skb_ts_finish; |