From owner-svn-src-projects@FreeBSD.ORG Sun Apr 15 10:35:13 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 41FDC106566C; Sun, 15 Apr 2012 10:35:13 +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 12D568FC0C; Sun, 15 Apr 2012 10:35:13 +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 q3FAZCSB078878; Sun, 15 Apr 2012 10:35:12 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3FAZC2U078875; Sun, 15 Apr 2012 10:35:12 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201204151035.q3FAZC2U078875@svn.freebsd.org> From: Gleb Smirnoff Date: Sun, 15 Apr 2012 10:35:12 +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: r234307 - 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: Sun, 15 Apr 2012 10:35:13 -0000 Author: glebius Date: Sun Apr 15 10:35:12 2012 New Revision: 234307 URL: http://svn.freebsd.org/changeset/base/234307 Log: Remove useless pflog_softc and list of them. Modified: projects/pf/head/sys/contrib/pf/net/if_pflog.c projects/pf/head/sys/contrib/pf/net/if_pflog.h Modified: projects/pf/head/sys/contrib/pf/net/if_pflog.c ============================================================================== --- projects/pf/head/sys/contrib/pf/net/if_pflog.c Sun Apr 15 02:38:01 2012 (r234306) +++ projects/pf/head/sys/contrib/pf/net/if_pflog.c Sun Apr 15 10:35:12 2012 (r234307) @@ -102,7 +102,6 @@ static void pflogstart(struct ifnet *); static int pflog_clone_create(struct if_clone *, int, caddr_t); static void pflog_clone_destroy(struct ifnet *); -LIST_HEAD(, pflog_softc) pflogif_list; IFC_SIMPLE_DECLARE(pflog, 1); struct ifnet *pflogifs[PFLOGIFS_MAX]; /* for fast access */ @@ -111,7 +110,6 @@ static void pflogattach(int npflog) { int i; - LIST_INIT(&pflogif_list); for (i = 0; i < PFLOGIFS_MAX; i++) pflogifs[i] = NULL; if_clone_attach(&pflog_cloner); @@ -126,14 +124,8 @@ pflog_clone_create(struct if_clone *ifc, if (unit >= PFLOGIFS_MAX) return (EINVAL); - if ((pflogif = malloc(sizeof(*pflogif), - M_DEVBUF, M_NOWAIT|M_ZERO)) == NULL) - return (ENOMEM); - - pflogif->sc_unit = unit; - ifp = pflogif->sc_ifp = if_alloc(IFT_PFLOG); + ifp = if_alloc(IFT_PFLOG); if (ifp == NULL) { - free(pflogif, M_DEVBUF); return (ENOSPC); } if_initname(ifp, ifc->ifc_name, unit); @@ -148,12 +140,6 @@ pflog_clone_create(struct if_clone *ifc, bpfattach(ifp, DLT_PFLOG, PFLOG_HDRLEN); - /* XXX: Why pf(4) lock?! Better add a pflog lock?! */ - PF_LOCK(); - LIST_INSERT_HEAD(&pflogif_list, pflogif, sc_list); - pflogifs[unit] = ifp; - PF_UNLOCK(); - return (0); } @@ -162,11 +148,6 @@ pflog_clone_destroy(struct ifnet *ifp) { struct pflog_softc *pflogif = ifp->if_softc; - PF_LOCK(); - pflogifs[pflogif->sc_unit] = NULL; - LIST_REMOVE(pflogif, sc_list); - PF_UNLOCK(); - bpfdetach(ifp); if_detach(ifp); if_free(ifp); Modified: projects/pf/head/sys/contrib/pf/net/if_pflog.h ============================================================================== --- projects/pf/head/sys/contrib/pf/net/if_pflog.h Sun Apr 15 02:38:01 2012 (r234306) +++ projects/pf/head/sys/contrib/pf/net/if_pflog.h Sun Apr 15 10:35:12 2012 (r234307) @@ -29,12 +29,6 @@ #define PFLOGIFS_MAX 16 -struct pflog_softc { - struct ifnet *sc_ifp; /* the interface pointer */ - int sc_unit; - LIST_ENTRY(pflog_softc) sc_list; -}; - #define PFLOG_RULESET_NAME_SIZE 16 struct pfloghdr {