From owner-svn-src-head@FreeBSD.ORG Fri Jun 6 20:59:56 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D6CDAD48; Fri, 6 Jun 2014 20:59:56 +0000 (UTC) Received: from mail-qg0-x22d.google.com (mail-qg0-x22d.google.com [IPv6:2607:f8b0:400d:c04::22d]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 660E72E1C; Fri, 6 Jun 2014 20:59:56 +0000 (UTC) Received: by mail-qg0-f45.google.com with SMTP id z60so5623232qgd.32 for ; Fri, 06 Jun 2014 13:59:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=UVT781kFN43r1Ns68jN1Rjbn+E13HSdjVM78cyeutLE=; b=KAWlqRP98ugk515BYaxOnPQi345q7yBbDpm4Hb7w0DujntNm5DYPoKKA0C0tU1NCJb 04RKpECcwRz+vH54JXb6w11kkwVgMSLjbta+BHboecTg/24ir7tXRAqEAL8VRX1wfJrH 2st4KM1VcvX3dgrH1ERchYzjAcl/A9INdgAEvI0QXLiknFCUUwV5lrmYZcvcBp93g9bU pNNtadEPEhI5LlwczH86NHhg2QnOlybD05PRqszON6LjvR8GbnWuyqz8N5dXn2CZaKbC pE1CQ6J6uhfH4A78JsV54vgH8oac9dbEtxUSULw1zagfQXxuY49jWJrCahlgmoOKuTrD bAQg== MIME-Version: 1.0 X-Received: by 10.140.91.5 with SMTP id y5mr12209451qgd.12.1402088395609; Fri, 06 Jun 2014 13:59:55 -0700 (PDT) Sender: adrian.chadd@gmail.com Received: by 10.224.43.134 with HTTP; Fri, 6 Jun 2014 13:59:55 -0700 (PDT) In-Reply-To: <201406062049.s56KnuS9043729@svn.freebsd.org> References: <201406062049.s56KnuS9043729@svn.freebsd.org> Date: Fri, 6 Jun 2014 16:59:55 -0400 X-Google-Sender-Auth: Sfw6kBXr8ZT33tLCAtU9VNa8G7k Message-ID: Subject: Re: svn commit: r267187 - in head/sys/dev: e1000 ixgbe vmware/vmxnet3 From: Adrian Chadd To: Luigi Rizzo Content-Type: text/plain; charset=UTF-8 Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jun 2014 20:59:57 -0000 Thanks for finally committing this stuff! -a On 6 June 2014 16:49, Luigi Rizzo wrote: > Author: luigi > Date: Fri Jun 6 20:49:56 2014 > New Revision: 267187 > URL: http://svnweb.freebsd.org/changeset/base/267187 > > Log: > make sure if_transmit returns 0 if the mbuf is enqueued. > ixgbe/ixv.c still needs a similar fix but it takes a little > more restructuring of the code. > > MFC after: 3 days > > Modified: > head/sys/dev/e1000/if_igb.c > head/sys/dev/ixgbe/ixgbe.c > head/sys/dev/vmware/vmxnet3/if_vmx.c > > Modified: head/sys/dev/e1000/if_igb.c > ============================================================================== > --- head/sys/dev/e1000/if_igb.c Fri Jun 6 20:35:40 2014 (r267186) > +++ head/sys/dev/e1000/if_igb.c Fri Jun 6 20:49:56 2014 (r267187) > @@ -989,12 +989,12 @@ igb_mq_start(struct ifnet *ifp, struct m > if (err) > return (err); > if (IGB_TX_TRYLOCK(txr)) { > - err = igb_mq_start_locked(ifp, txr); > + igb_mq_start_locked(ifp, txr); > IGB_TX_UNLOCK(txr); > } else > taskqueue_enqueue(que->tq, &txr->txq_task); > > - return (err); > + return (0); > } > > static int > > Modified: head/sys/dev/ixgbe/ixgbe.c > ============================================================================== > --- head/sys/dev/ixgbe/ixgbe.c Fri Jun 6 20:35:40 2014 (r267186) > +++ head/sys/dev/ixgbe/ixgbe.c Fri Jun 6 20:49:56 2014 (r267187) > @@ -831,12 +831,12 @@ ixgbe_mq_start(struct ifnet *ifp, struct > if (err) > return (err); > if (IXGBE_TX_TRYLOCK(txr)) { > - err = ixgbe_mq_start_locked(ifp, txr); > + ixgbe_mq_start_locked(ifp, txr); > IXGBE_TX_UNLOCK(txr); > } else > taskqueue_enqueue(que->tq, &txr->txq_task); > > - return (err); > + return (0); > } > > static int > > Modified: head/sys/dev/vmware/vmxnet3/if_vmx.c > ============================================================================== > --- head/sys/dev/vmware/vmxnet3/if_vmx.c Fri Jun 6 20:35:40 2014 (r267186) > +++ head/sys/dev/vmware/vmxnet3/if_vmx.c Fri Jun 6 20:49:56 2014 (r267187) > @@ -2935,7 +2935,6 @@ vmxnet3_txq_mq_start_locked(struct vmxne > /* Assume worse case if this mbuf is the head of a chain. */ > if (m->m_next != NULL && avail < VMXNET3_TX_MAXSEGS) { > drbr_putback(ifp, br, m); > - error = ENOBUFS; > break; > } > > @@ -2958,7 +2957,7 @@ vmxnet3_txq_mq_start_locked(struct vmxne > txq->vxtxq_watchdog = VMXNET3_WATCHDOG_TIMEOUT; > } > > - return (error); > + return (0); > } > > static int >