From owner-svn-src-projects@FreeBSD.ORG Tue Apr 3 08:35:48 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 69240106564A; Tue, 3 Apr 2012 08:35:48 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 543418FC0A; Tue, 3 Apr 2012 08:35:48 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q338Zm4V039900; Tue, 3 Apr 2012 08:35:48 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q338ZmYF039898; Tue, 3 Apr 2012 08:35:48 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201204030835.q338ZmYF039898@svn.freebsd.org> From: Gleb Smirnoff Date: Tue, 3 Apr 2012 08:35:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233829 - projects/pf/head/sys/contrib/pf/net X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Apr 2012 08:35:48 -0000 Author: glebius Date: Tue Apr 3 08:35:47 2012 New Revision: 233829 URL: http://svn.freebsd.org/changeset/base/233829 Log: Get rid of pfsync_sendout1(). Modified: projects/pf/head/sys/contrib/pf/net/if_pfsync.c Modified: projects/pf/head/sys/contrib/pf/net/if_pfsync.c ============================================================================== --- projects/pf/head/sys/contrib/pf/net/if_pfsync.c Tue Apr 3 08:29:39 2012 (r233828) +++ projects/pf/head/sys/contrib/pf/net/if_pfsync.c Tue Apr 3 08:35:47 2012 (r233829) @@ -254,7 +254,6 @@ static int pfsync_multicast_setup(struct static void pfsync_multicast_cleanup(struct pfsync_softc *); static int pfsync_init(void); static void pfsync_uninit(void); -static void pfsync_sendout1(int); SYSCTL_NODE(_net, OID_AUTO, pfsync, CTLFLAG_RW, 0, "PFSYNC"); SYSCTL_VNET_STRUCT(_net_pfsync, OID_AUTO, stats, CTLFLAG_RW, @@ -282,7 +281,7 @@ static void pfsync_request_update(u_int3 static void pfsync_update_state_req(struct pf_state *); static void pfsync_drop(struct pfsync_softc *); -static void pfsync_sendout(void); +static void pfsync_sendout(int); static void pfsync_send_plus(void *, size_t); static void pfsync_timeout(void *); @@ -1321,7 +1320,7 @@ pfsyncioctl(struct ifnet *ifp, u_long cm return (EINVAL); if (ifr->ifr_mtu < ifp->if_mtu) { PF_LOCK(); - pfsync_sendout(); + pfsync_sendout(1); PF_UNLOCK(); } ifp->if_mtu = ifr->ifr_mtu; @@ -1373,7 +1372,7 @@ pfsyncioctl(struct ifnet *ifp, u_long cm (sc->sc_sync_if != NULL && sifp->if_mtu < sc->sc_sync_if->if_mtu) || sifp->if_mtu < MCLBYTES - sizeof(struct ip)) - pfsync_sendout(); + pfsync_sendout(1); sc->sc_sync_if = sifp; if (imo->imo_membership) { @@ -1529,13 +1528,7 @@ pfsync_drop(struct pfsync_softc *sc) } static void -pfsync_sendout() -{ - pfsync_sendout1(1); -} - -static void -pfsync_sendout1(int schedswi) +pfsync_sendout(int schedswi) { struct pfsync_softc *sc = V_pfsyncif; #if NBPFILTER > 0 @@ -1911,7 +1904,7 @@ pfsync_request_update(u_int32_t creatori nlen += sizeof(struct pfsync_subheader); if (sc->sc_len + nlen > sc->sc_ifp->if_mtu) { - pfsync_sendout(); + pfsync_sendout(1); nlen = sizeof(struct pfsync_subheader) + sizeof(struct pfsync_upd_req); @@ -2046,7 +2039,7 @@ pfsync_q_ins(struct pf_state *st, int q) nlen += sizeof(struct pfsync_subheader); if (sc->sc_len + nlen > sc->sc_ifp->if_mtu) { - pfsync_sendout(); + pfsync_sendout(1); nlen = sizeof(struct pfsync_subheader) + pfsync_qs[q].len; } @@ -2092,7 +2085,7 @@ pfsync_update_tdb(struct tdb *t, int out if (sc->sc_len + nlen > sc->sc_if.if_mtu) { PF_LOCK(); - pfsync_sendout(); + pfsync_sendout(1); PF_UNLOCK(); nlen = sizeof(struct pfsync_subheader) + @@ -2305,14 +2298,13 @@ pfsync_send_plus(void *plus, size_t plus PF_LOCK_ASSERT(); - if (sc->sc_len + pluslen > sc->sc_ifp->if_mtu) { - pfsync_sendout(); - } + if (sc->sc_len + pluslen > sc->sc_ifp->if_mtu) + pfsync_sendout(1); sc->sc_plus = plus; sc->sc_len += (sc->sc_pluslen = pluslen); - pfsync_sendout(); + pfsync_sendout(1); } static int @@ -2341,7 +2333,7 @@ pfsync_timeout(void *arg) pfsync_tmos++; PF_LOCK(); - pfsync_sendout(); + pfsync_sendout(1); PF_UNLOCK(); CURVNET_RESTORE(); @@ -2359,7 +2351,7 @@ pfsyncintr(void *arg) PF_LOCK(); if (sc->sc_len > PFSYNC_MINPKT) - pfsync_sendout1(0); + pfsync_sendout(0); _IF_DEQUEUE_ALL(&sc->sc_ifp->if_snd, m); PF_UNLOCK();