From owner-svn-src-user@FreeBSD.ORG Sun Jul 12 22:19:51 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 565AE106566B; Sun, 12 Jul 2009 22:19:51 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2B2E88FC0A; Sun, 12 Jul 2009 22:19:51 +0000 (UTC) (envelope-from kmacy@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 n6CMJpNw096596; Sun, 12 Jul 2009 22:19:51 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6CMJp6d096594; Sun, 12 Jul 2009 22:19:51 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200907122219.n6CMJp6d096594@svn.freebsd.org> From: Kip Macy Date: Sun, 12 Jul 2009 22:19:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r195648 - user/kmacy/head_ppacket/sys/net X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Jul 2009 22:19:51 -0000 Author: kmacy Date: Sun Jul 12 22:19:50 2009 New Revision: 195648 URL: http://svn.freebsd.org/changeset/base/195648 Log: add debugging foo Modified: user/kmacy/head_ppacket/sys/net/if_gre.c Modified: user/kmacy/head_ppacket/sys/net/if_gre.c ============================================================================== --- user/kmacy/head_ppacket/sys/net/if_gre.c Sun Jul 12 22:01:09 2009 (r195647) +++ user/kmacy/head_ppacket/sys/net/if_gre.c Sun Jul 12 22:19:50 2009 (r195648) @@ -209,17 +209,17 @@ greattach(void) } static int -gre_clone_create(ifc, unit, params) - struct if_clone *ifc; - int unit; - caddr_t params; +gre_clone_create(struct if_clone *ifc, int unit, caddr_t params) { struct gre_softc *sc; - + struct ifnet *ifp; + sc = malloc(sizeof(struct gre_softc), M_GRE, M_WAITOK | M_ZERO); - GRE2IFP(sc) = if_alloc(IFT_TUNNEL); - if (GRE2IFP(sc) == NULL) { + GRE2IFP(sc) = ifp = if_alloc(IFT_TUNNEL); + printf("gre_clone_create: ifp == %p GRE2IFP(sc) == %p\n", ifp, + GRE2IFP(sc)); + if (ifp == NULL) { free(sc, M_GRE); return (ENOSPC); } @@ -227,26 +227,26 @@ gre_clone_create(ifc, unit, params) mtx_init(&sc->gre_mtx, sc->sc_mtx_buf, NULL, MTX_DEF); sc->gre_refcnt = 1; - GRE2IFP(sc)->if_softc = sc; - if_initname(GRE2IFP(sc), ifc->ifc_name, unit); + ifp->if_softc = sc; + if_initname(ifp, ifc->ifc_name, unit); - GRE2IFP(sc)->if_snd.ifq_maxlen = IFQ_MAXLEN; - GRE2IFP(sc)->if_addrlen = 0; - GRE2IFP(sc)->if_hdrlen = 24; /* IP + GRE */ - GRE2IFP(sc)->if_mtu = GREMTU; - GRE2IFP(sc)->if_flags = IFF_POINTOPOINT|IFF_MULTICAST; - GRE2IFP(sc)->if_output = gre_output; - GRE2IFP(sc)->if_ioctl = gre_ioctl; + ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; + ifp->if_addrlen = 0; + ifp->if_hdrlen = 24; /* IP + GRE */ + ifp->if_mtu = GREMTU; + ifp->if_flags = IFF_POINTOPOINT|IFF_MULTICAST; + ifp->if_output = gre_output; + ifp->if_ioctl = gre_ioctl; sc->gre_dst.s_addr = sc->gre_src.s_addr = INADDR_ANY; sc->gre_proto = IPPROTO_GRE; - GRE2IFP(sc)->if_flags |= IFF_LINK0; + ifp->if_flags |= IFF_LINK0; sc->encap = NULL; sc->called = 0; sc->gre_fibnum = curthread->td_proc->p_fibnum; sc->gre_wccp_ver = WCCP_V1; sc->key = 0; - if_attach(GRE2IFP(sc)); - bpfattach(GRE2IFP(sc), DLT_NULL, sizeof(u_int32_t)); + if_attach(ifp); + bpfattach(ifp, DLT_NULL, sizeof(u_int32_t)); mtx_lock(&gre_mtx); LIST_INSERT_HEAD(&gre_softc_list, sc, sc_list); mtx_unlock(&gre_mtx);