diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-06-19 16:41:08 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-06-19 16:41:08 +0300 |
commit | 3394ade23d7e3934a166e973e664046ea6f559d4 (patch) | |
tree | f3078f5f2829da66e1e29e9d83917814af2f2356 /drivers/net/netconsole.c | |
parent | b0d369dbad20a8c9702607e7294d63c4a0c8e0fe (diff) | |
parent | a2b47f77e740a21dbdcb12e2f2ca3c840299545a (diff) | |
download | linux-3394ade23d7e3934a166e973e664046ea6f559d4.tar.xz |
Merge v6.15.3
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/netconsole.c')
-rw-r--r-- | drivers/net/netconsole.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index 4289ccd3e41b..176935a8645f 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -1252,7 +1252,6 @@ static int sysdata_append_release(struct netconsole_target *nt, int offset) */ static int prepare_extradata(struct netconsole_target *nt) { - u32 fields = SYSDATA_CPU_NR | SYSDATA_TASKNAME; int extradata_len; /* userdata was appended when configfs write helper was called @@ -1260,7 +1259,7 @@ static int prepare_extradata(struct netconsole_target *nt) */ extradata_len = nt->userdata_length; - if (!(nt->sysdata_fields & fields)) + if (!nt->sysdata_fields) goto out; if (nt->sysdata_fields & SYSDATA_CPU_NR) |