Date: Fri, 10 Feb 2012 22:29:41 +0000 (UTC) From: Michael Tuexen <tuexen@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r231454 - stable/8/sys/netinet Message-ID: <201202102229.q1AMTf3E098832@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tuexen Date: Fri Feb 10 22:29:41 2012 New Revision: 231454 URL: http://svn.freebsd.org/changeset/base/231454 Log: MFC r223965: Don't check for SOCK_DGRAM anymore. Also remove multicast related code which is not necessary anymore. Modified: stable/8/sys/netinet/sctp_pcb.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/boot/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/e1000/ (props changed) Modified: stable/8/sys/netinet/sctp_pcb.c ============================================================================== --- stable/8/sys/netinet/sctp_pcb.c Fri Feb 10 22:26:33 2012 (r231453) +++ stable/8/sys/netinet/sctp_pcb.c Fri Feb 10 22:29:41 2012 (r231454) @@ -2523,8 +2523,7 @@ sctp_inpcb_alloc(struct socket *so, uint so->so_pcb = (caddr_t)inp; - if ((SCTP_SO_TYPE(so) == SOCK_DGRAM) || - (SCTP_SO_TYPE(so) == SOCK_SEQPACKET)) { + if (SCTP_SO_TYPE(so) == SOCK_SEQPACKET) { /* UDP style socket */ inp->sctp_flags = (SCTP_PCB_FLAGS_UDPTYPE | SCTP_PCB_FLAGS_UNBOUND); @@ -3721,13 +3720,6 @@ sctp_inpcb_free(struct sctp_inpcb *inp, (void)sctp_m_free(ip_pcb->inp_options); ip_pcb->inp_options = 0; } -#ifdef INET - if (ip_pcb->inp_moptions) { - inp_freemoptions(ip_pcb->inp_moptions); - ip_pcb->inp_moptions = 0; - } -#endif - #ifdef INET6 if (ip_pcb->inp_vflag & INP_IPV6) { struct in6pcb *in6p;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201202102229.q1AMTf3E098832>