From owner-svn-src-head@FreeBSD.ORG Mon Feb 16 10:29:04 2009 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 357441065672; Mon, 16 Feb 2009 10:29:04 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 230EE8FC17; Mon, 16 Feb 2009 10:29:04 +0000 (UTC) (envelope-from rwatson@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 n1GAT4vZ050462; Mon, 16 Feb 2009 10:29:04 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1GAT46m050461; Mon, 16 Feb 2009 10:29:04 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <200902161029.n1GAT46m050461@svn.freebsd.org> From: Robert Watson Date: Mon, 16 Feb 2009 10:29:04 +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: r188668 - head/sys/net 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: Mon, 16 Feb 2009 10:29:04 -0000 Author: rwatson Date: Mon Feb 16 10:29:03 2009 New Revision: 188668 URL: http://svn.freebsd.org/changeset/base/188668 Log: IFF_NEEDSGIANT will no longer be supported, so remove compatibility code from if_sppp framework for interfaces requiring Giant. Modified: head/sys/net/if_spppsubr.c Modified: head/sys/net/if_spppsubr.c ============================================================================== --- head/sys/net/if_spppsubr.c Mon Feb 16 03:54:28 2009 (r188667) +++ head/sys/net/if_spppsubr.c Mon Feb 16 10:29:03 2009 (r188668) @@ -236,25 +236,10 @@ struct cp { #define SPP_FMT "%s: " #define SPP_ARGS(ifp) (ifp)->if_xname -#define SPPP_LOCK(sp) \ - do { \ - if (!(SP2IFP(sp)->if_flags & IFF_NEEDSGIANT)) \ - mtx_lock (&(sp)->mtx); \ - } while (0) -#define SPPP_UNLOCK(sp) \ - do { \ - if (!(SP2IFP(sp)->if_flags & IFF_NEEDSGIANT)) \ - mtx_unlock (&(sp)->mtx); \ - } while (0) - -#define SPPP_LOCK_ASSERT(sp) \ - do { \ - if (!(SP2IFP(sp)->if_flags & IFF_NEEDSGIANT)) \ - mtx_assert (&(sp)->mtx, MA_OWNED); \ - } while (0) -#define SPPP_LOCK_OWNED(sp) \ - (!(SP2IFP(sp)->if_flags & IFF_NEEDSGIANT) && \ - mtx_owned (&sp->mtx)) +#define SPPP_LOCK(sp) mtx_lock (&(sp)->mtx) +#define SPPP_UNLOCK(sp) mtx_unlock (&(sp)->mtx) +#define SPPP_LOCK_ASSERT(sp) mtx_assert (&(sp)->mtx, MA_OWNED) +#define SPPP_LOCK_OWNED(sp) mtx_owned (&sp->mtx) #ifdef INET /* @@ -1055,8 +1040,7 @@ sppp_attach(struct ifnet *ifp) mtx_init(&sp->mtx, "sppp", MTX_NETWORK_LOCK, MTX_DEF | MTX_RECURSE); /* Initialize keepalive handler. */ - callout_init(&sp->keepalive_callout, - (ifp->if_flags & IFF_NEEDSGIANT) ? 0 : CALLOUT_MPSAFE); + callout_init(&sp->keepalive_callout, CALLOUT_MPSAFE); callout_reset(&sp->keepalive_callout, hz * 10, sppp_keepalive, (void *)sp); @@ -1088,8 +1072,7 @@ sppp_attach(struct ifnet *ifp) #ifdef INET6 sp->confflags |= CONF_ENABLE_IPV6; #endif - callout_init(&sp->ifstart_callout, - (ifp->if_flags & IFF_NEEDSGIANT) ? 0 : CALLOUT_MPSAFE); + callout_init(&sp->ifstart_callout, CALLOUT_MPSAFE); sp->if_start = ifp->if_start; ifp->if_start = sppp_ifstart; sp->pp_comp = malloc(sizeof(struct slcompress), M_TEMP, M_WAITOK); @@ -2211,8 +2194,7 @@ sppp_lcp_init(struct sppp *sp) sp->lcp.max_terminate = 2; sp->lcp.max_configure = 10; sp->lcp.max_failure = 10; - callout_init(&sp->ch[IDX_LCP], - (SP2IFP(sp)->if_flags & IFF_NEEDSGIANT) ? 0 : CALLOUT_MPSAFE); + callout_init(&sp->ch[IDX_LCP], CALLOUT_MPSAFE); } static void @@ -2903,8 +2885,7 @@ sppp_ipcp_init(struct sppp *sp) sp->fail_counter[IDX_IPCP] = 0; sp->pp_seq[IDX_IPCP] = 0; sp->pp_rseq[IDX_IPCP] = 0; - callout_init(&sp->ch[IDX_IPCP], - (SP2IFP(sp)->if_flags & IFF_NEEDSGIANT) ? 0 : CALLOUT_MPSAFE); + callout_init(&sp->ch[IDX_IPCP], CALLOUT_MPSAFE); } static void @@ -3463,8 +3444,7 @@ sppp_ipv6cp_init(struct sppp *sp) sp->fail_counter[IDX_IPV6CP] = 0; sp->pp_seq[IDX_IPV6CP] = 0; sp->pp_rseq[IDX_IPV6CP] = 0; - callout_init(&sp->ch[IDX_IPV6CP], - (SP2IFP(sp)->if_flags & IFF_NEEDSGIANT) ? 0 : CALLOUT_MPSAFE); + callout_init(&sp->ch[IDX_IPV6CP], CALLOUT_MPSAFE); } static void @@ -4272,8 +4252,7 @@ sppp_chap_init(struct sppp *sp) sp->fail_counter[IDX_CHAP] = 0; sp->pp_seq[IDX_CHAP] = 0; sp->pp_rseq[IDX_CHAP] = 0; - callout_init(&sp->ch[IDX_CHAP], - (SP2IFP(sp)->if_flags & IFF_NEEDSGIANT) ? 0 : CALLOUT_MPSAFE); + callout_init(&sp->ch[IDX_CHAP], CALLOUT_MPSAFE); } static void @@ -4604,10 +4583,8 @@ sppp_pap_init(struct sppp *sp) sp->fail_counter[IDX_PAP] = 0; sp->pp_seq[IDX_PAP] = 0; sp->pp_rseq[IDX_PAP] = 0; - callout_init(&sp->ch[IDX_PAP], - (SP2IFP(sp)->if_flags & IFF_NEEDSGIANT) ? 0 : CALLOUT_MPSAFE); - callout_init(&sp->pap_my_to_ch, - (SP2IFP(sp)->if_flags & IFF_NEEDSGIANT) ? 0 : CALLOUT_MPSAFE); + callout_init(&sp->ch[IDX_PAP], CALLOUT_MPSAFE); + callout_init(&sp->pap_my_to_ch, CALLOUT_MPSAFE); } static void