From owner-svn-src-head@FreeBSD.ORG Sat Dec 27 19:42:59 2008 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E08D0106567C; Sat, 27 Dec 2008 19:42:59 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D0DE08FC19; Sat, 27 Dec 2008 19:42:59 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBRJgxnC080323; Sat, 27 Dec 2008 19:42:59 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBRJgxwJ080322; Sat, 27 Dec 2008 19:42:59 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <200812271942.mBRJgxwJ080322@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Sat, 27 Dec 2008 19:42:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r186527 - head/sys/netipsec X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Dec 2008 19:43:00 -0000 Author: bz Date: Sat Dec 27 19:42:59 2008 New Revision: 186527 URL: http://svn.freebsd.org/changeset/base/186527 Log: For consistency with ipsec4_setspidx_inpcb() rename file local function ipsec6_setspidx_in6pcb() to ipsec6_setspidx_inpcb(). MFC after: 4 weeks Modified: head/sys/netipsec/ipsec.c Modified: head/sys/netipsec/ipsec.c ============================================================================== --- head/sys/netipsec/ipsec.c Sat Dec 27 19:37:46 2008 (r186526) +++ head/sys/netipsec/ipsec.c Sat Dec 27 19:42:59 2008 (r186527) @@ -230,7 +230,7 @@ SYSCTL_V_STRUCT(V_NET, vnet_ipsec, _net_ static int ipsec4_setspidx_inpcb __P((struct mbuf *, struct inpcb *pcb)); #ifdef INET6 -static int ipsec6_setspidx_in6pcb __P((struct mbuf *, struct inpcb *pcb)); +static int ipsec6_setspidx_inpcb __P((struct mbuf *, struct inpcb *pcb)); #endif static int ipsec_setspidx __P((struct mbuf *, struct secpolicyindex *, int)); static void ipsec4_get_ulp __P((struct mbuf *m, struct secpolicyindex *, int)); @@ -371,7 +371,7 @@ ipsec_getpolicybysock(struct mbuf *m, u_ /* set spidx in pcb */ if (inp->inp_vflag & INP_IPV6PROTO) { #ifdef INET6 - *error = ipsec6_setspidx_in6pcb(m, inp); + *error = ipsec6_setspidx_inpcb(m, inp); pcbsp = inp->inp_sp; #else *error = EINVAL; /* should not happen */ @@ -572,7 +572,7 @@ ipsec4_setspidx_inpcb(m, pcb) #ifdef INET6 static int -ipsec6_setspidx_in6pcb(m, pcb) +ipsec6_setspidx_inpcb(m, pcb) struct mbuf *m; struct inpcb *pcb; {