Date: Mon, 27 Apr 2009 20:33:01 +0200 From: Andreas Tobler <andreast-list@fgznet.ch> To: Jack F Vogel <jfv@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r191566 - head/sys/dev/e1000 Message-ID: <49F5FA5D.8060905@fgznet.ch> In-Reply-To: <200904271722.n3RHMF53020951@svn.freebsd.org> References: <200904271722.n3RHMF53020951@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?49F5FA5D.8060905>