Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

This commit is contained in:
Paolo Abeni
2022-04-15 09:26:00 +02:00
469 changed files with 4878 additions and 3535 deletions

View File

@@ -5635,7 +5635,7 @@ int sctp_do_peeloff(struct sock *sk, sctp_assoc_t id, struct socket **sockp)
* Set the daddr and initialize id to something more random and also
* copy over any ip options.
*/
sp->pf->to_sk_daddr(&asoc->peer.primary_addr, sk);
sp->pf->to_sk_daddr(&asoc->peer.primary_addr, sock->sk);
sp->pf->copy_ip_options(sk, sock->sk);
/* Populate the fields of the newsk from the oldsk and migrate the