From owner-svn-src-all@FreeBSD.ORG Wed Jul 27 07:02:33 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A5843106566B; Wed, 27 Jul 2011 07:02:33 +0000 (UTC) (envelope-from maxim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 947128FC13; Wed, 27 Jul 2011 07:02:33 +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 p6R72XXd045472; Wed, 27 Jul 2011 07:02:33 GMT (envelope-from maxim@svn.freebsd.org) Received: (from maxim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6R72XC6045470; Wed, 27 Jul 2011 07:02:33 GMT (envelope-from maxim@svn.freebsd.org) Message-Id: <201107270702.p6R72XC6045470@svn.freebsd.org> From: Maxim Konovalov Date: Wed, 27 Jul 2011 07:02:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r224466 - stable/8/sys/net X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jul 2011 07:02:33 -0000 Author: maxim Date: Wed Jul 27 07:02:33 2011 New Revision: 224466 URL: http://svn.freebsd.org/changeset/base/224466 Log: MFC r223846 by thompsa: grab the rlock before checking if our interface is enabled. Approved by: thompsa Modified: stable/8/sys/net/if_lagg.c Modified: stable/8/sys/net/if_lagg.c ============================================================================== --- stable/8/sys/net/if_lagg.c Wed Jul 27 04:23:26 2011 (r224465) +++ stable/8/sys/net/if_lagg.c Wed Jul 27 07:02:33 2011 (r224466) @@ -1213,14 +1213,15 @@ lagg_input(struct ifnet *ifp, struct mbu struct lagg_softc *sc = lp->lp_softc; struct ifnet *scifp = sc->sc_ifp; + LAGG_RLOCK(sc); if ((scifp->if_drv_flags & IFF_DRV_RUNNING) == 0 || (lp->lp_flags & LAGG_PORT_DISABLED) || sc->sc_proto == LAGG_PROTO_NONE) { + LAGG_RUNLOCK(sc); m_freem(m); return (NULL); } - LAGG_RLOCK(sc); ETHER_BPF_MTAP(scifp, m); m = (*sc->sc_input)(sc, lp, m);