diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2023-11-16 16:05:44 +0100 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2023-11-16 16:05:44 +0100 |
| commit | 56eddc3cb1affe014d567f8460e5a76ca079f842 (patch) | |
| tree | 7363e0f189ac7276fcb1bd2660f8478a45fd00d6 /lib | |
| parent | 3185d57cfcd34fadbe28f4ed57a6cb5122277ece (diff) | |
| parent | 7475e51b87969e01a6812eac713a1c8310372e8a (diff) | |
| download | linux-56eddc3cb1affe014d567f8460e5a76ca079f842.tar.gz linux-56eddc3cb1affe014d567f8460e5a76ca079f842.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/test_objpool.c | 6 | ||||
| -rw-r--r-- | lib/zstd/common/fse_decompress.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/test_objpool.c b/lib/test_objpool.c index a94078402138..bfdb81599832 100644 --- a/lib/test_objpool.c +++ b/lib/test_objpool.c @@ -311,7 +311,7 @@ static void ot_fini_sync(struct ot_context *sop) ot_kfree(sop->test, sop, sizeof(*sop)); } -struct { +static struct { struct ot_context * (*init)(struct ot_test *oc); void (*fini)(struct ot_context *sop); } g_ot_sync_ops[] = { @@ -475,7 +475,7 @@ static struct ot_context *ot_init_async_m0(struct ot_test *test) return sop; } -struct { +static struct { struct ot_context * (*init)(struct ot_test *oc); void (*fini)(struct ot_context *sop); } g_ot_async_ops[] = { @@ -632,7 +632,7 @@ static int ot_start_async(struct ot_test *test) #define NODE_COMPACT sizeof(struct ot_node) #define NODE_VMALLOC (512) -struct ot_test g_testcases[] = { +static struct ot_test g_testcases[] = { /* sync & normal */ {0, 0, NODE_COMPACT, 1000, 0, 1, 0, 0, "sync: percpu objpool"}, diff --git a/lib/zstd/common/fse_decompress.c b/lib/zstd/common/fse_decompress.c index a0d06095be83..8dcb8ca39767 100644 --- a/lib/zstd/common/fse_decompress.c +++ b/lib/zstd/common/fse_decompress.c @@ -312,7 +312,7 @@ size_t FSE_decompress_wksp(void* dst, size_t dstCapacity, const void* cSrc, size typedef struct { short ncount[FSE_MAX_SYMBOL_VALUE + 1]; - FSE_DTable dtable[1]; /* Dynamically sized */ + FSE_DTable dtable[]; /* Dynamically sized */ } FSE_DecompressWksp; |