From owner-svn-src-all@FreeBSD.ORG Mon Apr 27 18:35:40 2009 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 31DEF1065865; Mon, 27 Apr 2009 18:35:40 +0000 (UTC) (envelope-from jfvogel@gmail.com) Received: from mail-qy0-f105.google.com (mail-qy0-f105.google.com [209.85.221.105]) by mx1.freebsd.org (Postfix) with ESMTP id 760AE8FC13; Mon, 27 Apr 2009 18:35:39 +0000 (UTC) (envelope-from jfvogel@gmail.com) Received: by qyk3 with SMTP id 3so180571qyk.3 for ; Mon, 27 Apr 2009 11:35:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:cc:content-type; bh=7WCYrHJAZFao1G4HTpxeewGKw8XRTy2oC16kB1DpQRE=; b=phW+Fnsz/jWwlrreU66rpnik/1m5zuLGH14uQagCSaUsxIhAOJUQWwTrHJKZqdEAPy kBwnaJlyjwthPzI46s+pR+rzc/4xQtr7cobZpB6/G0xyQGaXvJ0ZBZb0fYpFSX4GXQws oYOHz17JC/ErvlQI/N4RnSZy/vzoJdY7p2imI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=qY7gQp1/PQkGdRkwX+fsQNiaJsViff6MdAZ9unJ4uP2bkPAtK0ruAxa2aNdMmPuIHA lVcIfn1JNhvjN8gWPcLvVsPOxDcKW7k2jhLGjL0oxbVN6ipMDypwXCBYjGjzgw1bJXn/ Hb4MKqOAMBQppEvVEMzQ7c0tF7badHqH6TKK4= MIME-Version: 1.0 Received: by 10.224.37.19 with SMTP id v19mr6433910qad.70.1240857338406; Mon, 27 Apr 2009 11:35:38 -0700 (PDT) In-Reply-To: <49F5FA5D.8060905@fgznet.ch> References: <200904271722.n3RHMF53020951@svn.freebsd.org> <49F5FA5D.8060905@fgznet.ch> Date: Mon, 27 Apr 2009 11:35:38 -0700 Message-ID: <2a41acea0904271135m2d5f1e6av5fc2b0b7e86d10ea@mail.gmail.com> From: Jack Vogel To: Andreas Tobler Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: Jack F Vogel , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r191566 - head/sys/dev/e1000 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: Mon, 27 Apr 2009 18:35:41 -0000 DUH, thanks for catching it quickly, the build breaking would have sooner or later though :) Jack On Mon, Apr 27, 2009 at 11:33 AM, Andreas Tobler wrote: > Jack F Vogel wrote: > >> Author: jfv >> Date: Mon Apr 27 17:22:14 2009 >> New Revision: 191566 >> URL: http://svn.freebsd.org/changeset/base/191566 >> >> Log: >> Thanks for Michael Tuexen for tracking down a path where >> the watchdog timer was not being rearmed in txeof, and also >> a missing case in the new code. >> MFC after: 2 weeks >> >> Modified: >> head/sys/dev/e1000/if_em.c >> >> Modified: head/sys/dev/e1000/if_em.c >> >> ============================================================================== >> --- head/sys/dev/e1000/if_em.c Mon Apr 27 16:57:19 2009 (r191565) >> +++ head/sys/dev/e1000/if_em.c Mon Apr 27 17:22:14 2009 (r191566) >> @@ -1013,12 +1013,15 @@ em_transmit_locked(struct ifnet *ifp, st >> if (ADAPTER_RING_EMPTY(adapter) && >> (adapter->num_tx_desc_avail > EM_TX_OP_THRESHOLD)) { >> if (em_xmit(adapter, &m)) { >> - if (m && (error = drbr_enqueue(ifp, adapter->br, >> m)) != 0) { >> + if (m && (error = drbr_enqueue(ifp, adapter->br, >> m)) != 0) >> return (error); >> - } >> - } else{ >> - /* Send a copy of the frame to the BPF listener */ >> + } else { >> + /* >> + ** Send a copy of the frame to the BPF >> + ** listener and set the watchdog on. >> + */ >> ETHER_BPF_MTAP(ifp, m); >> + addapter->watchdog_timer = EM_TX_TIMEOUT; >> > > [deuterium_fbsd:sys/dev/e1000] andreast% svn diff if_em.c > Index: if_em.c > =================================================================== > --- if_em.c (revision 191575) > +++ if_em.c (working copy) > @@ -1021,7 +1021,7 @@ > ** listener and set the watchdog on. > */ > ETHER_BPF_MTAP(ifp, m); > - addapter->watchdog_timer = EM_TX_TIMEOUT; > + adapter->watchdog_timer = EM_TX_TIMEOUT; > } > } else if ((error = drbr_enqueue(ifp, adapter->br, m)) != 0) > return (error); > > > Should fix the build. > > Andreas > >