diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-06-27 18:45:22 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-06-27 18:45:22 +0200 |
| commit | 3674fbf0451df0395f9fa18df3122927006a3829 (patch) | |
| tree | 632690d6c74a7bedb166299bbc92059cd3a537f9 /lib | |
| parent | Revert "af_unix: Call scm_recv() only after scm_set_cred()." (diff) | |
| parent | netlink: Add __sock_i_ino() for __netlink_diag_dump(). (diff) | |
| download | linux-3674fbf0451df0395f9fa18df3122927006a3829.tar.xz linux-3674fbf0451df0395f9fa18df3122927006a3829.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge in late fixes to prepare for the 6.5 net-next PR.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ts_bm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/ts_bm.c b/lib/ts_bm.c index 1f2234221dd1..c8ecbf74ef29 100644 --- a/lib/ts_bm.c +++ b/lib/ts_bm.c @@ -60,10 +60,12 @@ static unsigned int bm_find(struct ts_config *conf, struct ts_state *state) struct ts_bm *bm = ts_config_priv(conf); unsigned int i, text_len, consumed = state->offset; const u8 *text; - int shift = bm->patlen - 1, bs; + int bs; const u8 icase = conf->flags & TS_IGNORECASE; for (;;) { + int shift = bm->patlen - 1; + text_len = conf->get_next_block(consumed, &text, conf, state); if (unlikely(text_len == 0)) |