From owner-freebsd-current@FreeBSD.ORG Sat Oct 16 01:25:46 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CF8C516A4CE; Sat, 16 Oct 2004 01:25:46 +0000 (GMT) Received: from arginine.spc.org (arginine.spc.org [195.206.69.236]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2A27A43D39; Sat, 16 Oct 2004 01:25:46 +0000 (GMT) (envelope-from bms@spc.org) Received: from localhost (localhost [127.0.0.1]) by arginine.spc.org (Postfix) with ESMTP id F2B16652EC; Sat, 16 Oct 2004 02:25:43 +0100 (BST) Received: from arginine.spc.org ([127.0.0.1]) by localhost (arginine.spc.org [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 70302-05-6; Sat, 16 Oct 2004 02:25:43 +0100 (BST) Received: from empiric.dek.spc.org (dhcp120.icir.org [192.150.187.120]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by arginine.spc.org (Postfix) with ESMTP id B419E6520C; Sat, 16 Oct 2004 02:25:42 +0100 (BST) Received: by empiric.dek.spc.org (Postfix, from userid 1001) id CFF0B63E8; Fri, 15 Oct 2004 18:25:36 -0700 (PDT) Date: Fri, 15 Oct 2004 18:25:36 -0700 From: Bruce M Simpson To: nbco@screaming.net, freebsd-gnats-submit@FreeBSD.org Message-ID: <20041016012536.GS61186@empiric.icir.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="00sTfE/IIAT5d2r5" Content-Disposition: inline cc: freebsdnic@mailbox.intel.com cc: mlaier@FreeBSD.org cc: current@FreeBSD.org Subject: Re: kern/72748: em0 problems on t41 after updating to 5.3 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Oct 2004 01:25:47 -0000 --00sTfE/IIAT5d2r5 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline [Cc: to current@ as this could be a show-stopper for RELENG_5_3] Could you please try the attached patch, which reverts the ALTQ changes introduced on the RELENG_5 branch, and let me know if this resolves the issue? Thanks, BMS --00sTfE/IIAT5d2r5 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="altq-releng5-em-backout.diff" Index: if_em.c =================================================================== RCS file: /home/ncvs/src/sys/dev/em/if_em.c,v retrieving revision 1.44.2.2 diff -u -p -r1.44.2.2 if_em.c --- if_em.c 15 Oct 2004 22:12:59 -0000 1.44.2.2 +++ if_em.c 16 Oct 2004 00:30:26 -0000 @@ -610,15 +610,15 @@ em_start_locked(struct ifnet *ifp) if (!adapter->link_active) return; - while (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) { + while (ifp->if_snd.ifq_head != NULL) { - IFQ_DRV_DEQUEUE(&ifp->if_snd, m_head); + IF_DEQUEUE(&ifp->if_snd, m_head); if (m_head == NULL) break; if (em_encap(adapter, m_head)) { ifp->if_flags |= IFF_OACTIVE; - IFQ_DRV_PREPEND(&ifp->if_snd, m_head); + IF_PREPEND(&ifp->if_snd, m_head); break; } @@ -949,7 +949,7 @@ em_poll_locked(struct ifnet *ifp, enum p em_clean_transmit_interrupts(adapter); } - if (ifp->if_flags & IFF_RUNNING && !IFQ_DRV_IS_EMPTY(&ifp->if_snd)) + if (ifp->if_flags & IFF_RUNNING && ifp->if_snd.ifq_head != NULL) em_start_locked(ifp); } @@ -1019,7 +1019,7 @@ em_intr(void *arg) loop_cnt--; } - if (ifp->if_flags & IFF_RUNNING && !IFQ_DRV_IS_EMPTY(&ifp->if_snd)) + if (ifp->if_flags & IFF_RUNNING && ifp->if_snd.ifq_head != NULL) em_start_locked(ifp); EM_UNLOCK(adapter); @@ -1892,9 +1892,7 @@ em_setup_interface(device_t dev, struct ifp->if_ioctl = em_ioctl; ifp->if_start = em_start; ifp->if_watchdog = em_watchdog; - IFQ_SET_MAXLEN(&ifp->if_snd, adapter->num_tx_desc - 1); - ifp->if_snd.ifq_drv_maxlen = adapter->num_tx_desc - 1; - IFQ_SET_READY(&ifp->if_snd); + ifp->if_snd.ifq_maxlen = adapter->num_tx_desc - 1; #if __FreeBSD_version < 500000 ether_ifattach(ifp, ETHER_BPF_SUPPORTED); --00sTfE/IIAT5d2r5--