Date: Tue, 5 Aug 2014 14:12:00 +0100 (BST) From: Gavin Atkinson <gavin@FreeBSD.org> To: Peter Wemm <peter@FreeBSD.org> Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-10@freebsd.org Subject: Re: svn commit: r269490 - stable/10/sys/kern Message-ID: <alpine.BSF.2.11.1408051409480.4907@ury.york.ac.uk> In-Reply-To: <53debee3.5327.470761ac@svn.freebsd.org> References: <53debee3.5327.470761ac@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, 3 Aug 2014, Peter Wemm wrote: > Author: peter > Date: Sun Aug 3 22:59:47 2014 > New Revision: 269490 > URL: http://svnweb.freebsd.org/changeset/base/269490 > > Log: > Insta-MFC r269489: partial revert of r262867 which was MFC'ed as r263820. > Don't ignore sndbuf/rcvbuf limits for SOCK_DGRAM sockets. This appears > to be an edit error or patch fuzz mismatch. It looks like the original commit was also merged to stable/9 as r263823, though with an incorrect commit message. It made it into 9.3-RELEASE, I I would say that this is an EN candidate. Gavin > Modified: > stable/10/sys/kern/uipc_usrreq.c > > Modified: stable/10/sys/kern/uipc_usrreq.c > ============================================================================== > --- stable/10/sys/kern/uipc_usrreq.c Sun Aug 3 22:37:21 2014 (r269489) > +++ stable/10/sys/kern/uipc_usrreq.c Sun Aug 3 22:59:47 2014 (r269490) > @@ -897,7 +897,7 @@ uipc_send(struct socket *so, int flags, > from = &sun_noname; > so2 = unp2->unp_socket; > SOCKBUF_LOCK(&so2->so_rcv); > - if (sbappendaddr_nospacecheck_locked(&so2->so_rcv, from, m, > + if (sbappendaddr_locked(&so2->so_rcv, from, m, > control)) { > sorwakeup_locked(so2); > m = NULL;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?alpine.BSF.2.11.1408051409480.4907>