From owner-svn-src-all@FreeBSD.ORG Wed Jul 25 12:51:34 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2D70B106566B; Wed, 25 Jul 2012 12:51:34 +0000 (UTC) (envelope-from luigi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F28E88FC14; Wed, 25 Jul 2012 12:51:33 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6PCpXV0059418; Wed, 25 Jul 2012 12:51:33 GMT (envelope-from luigi@svn.freebsd.org) Received: (from luigi@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6PCpXp8059416; Wed, 25 Jul 2012 12:51:33 GMT (envelope-from luigi@svn.freebsd.org) Message-Id: <201207251251.q6PCpXp8059416@svn.freebsd.org> From: Luigi Rizzo Date: Wed, 25 Jul 2012 12:51:33 +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: r238770 - 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: Wed, 25 Jul 2012 12:51:34 -0000 Author: luigi Date: Wed Jul 25 12:51:33 2012 New Revision: 238770 URL: http://svn.freebsd.org/changeset/base/238770 Log: remove some extra testing code that slipped into the previous commit Reported-by: Alexander Motin Modified: head/sys/dev/e1000/if_lem.c Modified: head/sys/dev/e1000/if_lem.c ============================================================================== --- head/sys/dev/e1000/if_lem.c Wed Jul 25 12:14:39 2012 (r238769) +++ head/sys/dev/e1000/if_lem.c Wed Jul 25 12:51:33 2012 (r238770) @@ -1550,13 +1550,6 @@ lem_xmit(struct adapter *adapter, struct u32 txd_upper, txd_lower, txd_used, txd_saved; int error, nsegs, i, j, first, last = 0; -extern int netmap_drop; - if (netmap_drop == 95) { -dropme: - m_freem(*m_headp); - *m_headp = NULL; - return (ENOBUFS); - } m_head = *m_headp; txd_upper = txd_lower = txd_used = txd_saved = 0; @@ -1696,9 +1689,6 @@ dropme: } } - if (netmap_drop == 96) - goto dropme; - adapter->next_avail_tx_desc = i; if (adapter->pcix_82544) @@ -1726,16 +1716,6 @@ dropme: */ ctxd->lower.data |= htole32(E1000_TXD_CMD_EOP | E1000_TXD_CMD_RS); - -if (netmap_drop == 97) { - static int count=0; - if (count++ & 63 != 0) - ctxd->lower.data &= - ~htole32(E1000_TXD_CMD_RS); - else - D("preserve RS"); - -} /* * Keep track in the first buffer which * descriptor will be written back @@ -1754,12 +1734,6 @@ if (netmap_drop == 97) { adapter->link_duplex == HALF_DUPLEX) lem_82547_move_tail(adapter); else { -extern int netmap_repeat; - if (netmap_repeat) { - int x; - for (x = 0; x < netmap_repeat; x++) - E1000_WRITE_REG(&adapter->hw, E1000_TDT(0), i); - } E1000_WRITE_REG(&adapter->hw, E1000_TDT(0), i); if (adapter->hw.mac.type == e1000_82547) lem_82547_update_fifo_head(adapter, @@ -3013,13 +2987,6 @@ lem_txeof(struct adapter *adapter) return; } #endif /* DEV_NETMAP */ -{ - static int drops = 0; - if (netmap_copy && drops++ < netmap_copy) - return; - drops = 0; -} - if (adapter->num_tx_desc_avail == adapter->num_tx_desc) return;