Date: Sun, 29 Mar 2009 17:42:30 +0000 (UTC) From: Robert Watson <rwatson@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r190523 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb netinet Message-ID: <200903291742.n2THgU0n040633@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rwatson Date: Sun Mar 29 17:42:30 2009 New Revision: 190523 URL: http://svn.freebsd.org/changeset/base/190523 Log: Merge r185858 from head to stable/7: Remove inconsistent white space from in_pcballoc(). Approved by: re (kib) Modified: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/ath/ath_hal/ (props changed) stable/7/sys/dev/cxgb/ (props changed) stable/7/sys/netinet/in_pcb.c Modified: stable/7/sys/netinet/in_pcb.c ============================================================================== --- stable/7/sys/netinet/in_pcb.c Sun Mar 29 15:10:49 2009 (r190522) +++ stable/7/sys/netinet/in_pcb.c Sun Mar 29 17:42:30 2009 (r190523) @@ -196,7 +196,6 @@ in_pcballoc(struct socket *so, struct in mac_create_inpcb_from_socket(so, inp); SOCK_UNLOCK(so); #endif - #ifdef IPSEC error = ipsec_init_policy(so, &inp->inp_sp); if (error != 0) { @@ -222,7 +221,6 @@ in_pcballoc(struct socket *so, struct in #endif INP_WLOCK(inp); inp->inp_gencnt = ++pcbinfo->ipi_gencnt; - #if defined(IPSEC) || defined(MAC) out: if (error != 0) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903291742.n2THgU0n040633>