diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-01-28 09:30:11 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-01-28 09:30:11 +0100 |
| commit | 9a1f4150fe932fb892c05084029b3718b8ed1baf (patch) | |
| tree | b8f18ea5f0bdc842e3cf8da4700c1d577a3b1c66 /include/net/ipv6.h | |
| parent | f28442497b5caf7bf573ade22a7f8d3559e3ef56 (diff) | |
| parent | 1b1bc42c1692e9b62756323c675a44cb1a1f9dbd (diff) | |
| download | linux-9a1f4150fe932fb892c05084029b3718b8ed1baf.tar.gz linux-9a1f4150fe932fb892c05084029b3718b8ed1baf.tar.bz2 linux-9a1f4150fe932fb892c05084029b3718b8ed1baf.zip | |
Merge branch 'linus' into x86/boot, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/net/ipv6.h')
| -rw-r--r-- | include/net/ipv6.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index 487e57391664..7afe991e900e 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -871,7 +871,7 @@ int ip6_rcv_finish(struct net *net, struct sock *sk, struct sk_buff *skb); * upper-layer output functions */ int ip6_xmit(const struct sock *sk, struct sk_buff *skb, struct flowi6 *fl6, - struct ipv6_txoptions *opt, int tclass); + __u32 mark, struct ipv6_txoptions *opt, int tclass); int ip6_find_1stfragopt(struct sk_buff *skb, u8 **nexthdr); |