From owner-svn-src-all@FreeBSD.ORG Thu Sep 10 21:14:55 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 E660F106566B; Thu, 10 Sep 2009 21:14:55 +0000 (UTC) (envelope-from jfv@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D5A768FC18; Thu, 10 Sep 2009 21:14:55 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8ALEtxL031326; Thu, 10 Sep 2009 21:14:55 GMT (envelope-from jfv@svn.freebsd.org) Received: (from jfv@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8ALEtAr031324; Thu, 10 Sep 2009 21:14:55 GMT (envelope-from jfv@svn.freebsd.org) Message-Id: <200909102114.n8ALEtAr031324@svn.freebsd.org> From: Jack F Vogel Date: Thu, 10 Sep 2009 21:14:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197078 - 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: Thu, 10 Sep 2009 21:14:56 -0000 Author: jfv Date: Thu Sep 10 21:14:55 2009 New Revision: 197078 URL: http://svn.freebsd.org/changeset/base/197078 Log: Fix build complaint from previous checkin Modified: head/sys/dev/e1000/if_em.c Modified: head/sys/dev/e1000/if_em.c ============================================================================== --- head/sys/dev/e1000/if_em.c Thu Sep 10 19:27:53 2009 (r197077) +++ head/sys/dev/e1000/if_em.c Thu Sep 10 21:14:55 2009 (r197078) @@ -1034,7 +1034,7 @@ em_mq_start_locked(struct ifnet *ifp, st return (error); } else if (drbr_empty(ifp, adapter->br) && (adapter->num_tx_desc_avail > EM_TX_OP_THRESHOLD)) { - if (error = em_xmit(adapter, &m)) { + if ((error = em_xmit(adapter, &m)) != 0) { if (m != NULL) error = drbr_enqueue(ifp, adapter->br, m); return (error); @@ -1064,7 +1064,7 @@ process: next = drbr_dequeue(ifp, adapter->br); if (next == NULL) break; - if (error = em_xmit(adapter, &next)) { + if ((error = em_xmit(adapter, &next)) != 0) { if (next != NULL) error = drbr_enqueue(ifp, adapter->br, next); break;