From owner-cvs-src@FreeBSD.ORG Thu Sep 18 11:32:17 2003 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1C20716A4B3; Thu, 18 Sep 2003 11:32:17 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 92CB543FBD; Thu, 18 Sep 2003 11:32:16 -0700 (PDT) (envelope-from wpaul@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8IIWGXJ076557; Thu, 18 Sep 2003 11:32:16 -0700 (PDT) (envelope-from wpaul@repoman.freebsd.org) Received: (from wpaul@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8IIWGl1076556; Thu, 18 Sep 2003 11:32:16 -0700 (PDT) (envelope-from wpaul) Message-Id: <200309181832.h8IIWGl1076556@repoman.freebsd.org> From: Bill Paul Date: Thu, 18 Sep 2003 11:32:16 -0700 (PDT) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sys/dev/re if_re.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Sep 2003 18:32:17 -0000 wpaul 2003/09/18 11:32:16 PDT FreeBSD src repository Modified files: sys/dev/re if_re.c Log: In re_diag(), there's no need for us to call re_start() ourselves: IF_HANDOFF() does it for us behind the scenes. Remove the extra call to re_start() otherwise we try to transmit twice. In re_encap(), fix the code that guards against consuming too many descriptors in the TX ring so that it actually works. With the new 8169S chip, I was able to hit a corner case that drained the free descriptor count all the way to 0. This is not supposed to be possible. Revision Changes Path 1.8 +8 -4 src/sys/dev/re/if_re.c