diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-01-02 15:02:04 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-01-02 15:02:04 +0100 |
| commit | 87ad3722bfef925ac2379257cbc512d77d8c4d44 (patch) | |
| tree | 6df6210af7e3093c6ba5c99d24e435366fa89675 /include/linux/ipv6.h | |
| parent | f235bcfe6a0b678c16517142d906652a7befed73 (diff) | |
| parent | 30a7acd573899fd8b8ac39236eff6468b195ac7d (diff) | |
| download | linux-stable-87ad3722bfef925ac2379257cbc512d77d8c4d44.tar.gz linux-stable-87ad3722bfef925ac2379257cbc512d77d8c4d44.tar.bz2 linux-stable-87ad3722bfef925ac2379257cbc512d77d8c4d44.zip | |
Merge 4.15-rc6 into staging-next
We need the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/ipv6.h')
| -rw-r--r-- | include/linux/ipv6.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index cb18c6290ca8..8415bf1a9776 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h @@ -273,7 +273,8 @@ struct ipv6_pinfo { * 100: prefer care-of address */ dontfrag:1, - autoflowlabel:1; + autoflowlabel:1, + autoflowlabel_set:1; __u8 min_hopcount; __u8 tclass; __be32 rcv_flowinfo; |