diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-23 07:59:38 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-23 07:59:38 +0100 |
| commit | baca54d956f77be9abc487bcdddf7a2a1fbbda1b (patch) | |
| tree | 4dbd646d7f533c2c741ecb428563a84f5af8ceec /include/net/fib_rules.h | |
| parent | 217fb361167d4e108b9076e826a6d9624252696a (diff) | |
| parent | 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e (diff) | |
| download | kernel_replicant_linux-baca54d956f77be9abc487bcdddf7a2a1fbbda1b.tar.gz kernel_replicant_linux-baca54d956f77be9abc487bcdddf7a2a1fbbda1b.tar.bz2 kernel_replicant_linux-baca54d956f77be9abc487bcdddf7a2a1fbbda1b.zip | |
Merge 5.6-rc7 into char-misc-next
We need the char/misc driver fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/net/fib_rules.h')
| -rw-r--r-- | include/net/fib_rules.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/fib_rules.h b/include/net/fib_rules.h index 54e227e6b06a..a259050f84af 100644 --- a/include/net/fib_rules.h +++ b/include/net/fib_rules.h @@ -108,6 +108,7 @@ struct fib_rule_notifier_info { [FRA_OIFNAME] = { .type = NLA_STRING, .len = IFNAMSIZ - 1 }, \ [FRA_PRIORITY] = { .type = NLA_U32 }, \ [FRA_FWMARK] = { .type = NLA_U32 }, \ + [FRA_TUN_ID] = { .type = NLA_U64 }, \ [FRA_FWMASK] = { .type = NLA_U32 }, \ [FRA_TABLE] = { .type = NLA_U32 }, \ [FRA_SUPPRESS_PREFIXLEN] = { .type = NLA_U32 }, \ |