diff options
author | 2017-02-07 08:49:17 +0100 | |
---|---|---|
committer | 2017-02-07 08:49:17 +0100 | |
commit | 87a8d03266a55f18f31fdb71c28a8dcffe39124d (patch) | |
tree | ab337ca060871296a8dc5d47fcd45da9dcb17a3a /net/sctp/ipv6.c | |
parent | efi/libstub: Preserve .debug sections after absolute relocation check (diff) | |
parent | Linux 4.10-rc7 (diff) | |
download | linux-dev-87a8d03266a55f18f31fdb71c28a8dcffe39124d.tar.xz linux-dev-87a8d03266a55f18f31fdb71c28a8dcffe39124d.zip |
Merge tag 'v4.10-rc7' into efi/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/sctp/ipv6.c')
-rw-r--r-- | net/sctp/ipv6.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c index 5ed8e79bf102..64dfd35ccdcc 100644 --- a/net/sctp/ipv6.c +++ b/net/sctp/ipv6.c @@ -222,7 +222,8 @@ static int sctp_v6_xmit(struct sk_buff *skb, struct sctp_transport *transport) SCTP_INC_STATS(sock_net(sk), SCTP_MIB_OUTSCTPPACKS); rcu_read_lock(); - res = ip6_xmit(sk, skb, fl6, rcu_dereference(np->opt), np->tclass); + res = ip6_xmit(sk, skb, fl6, sk->sk_mark, rcu_dereference(np->opt), + np->tclass); rcu_read_unlock(); return res; } |