From owner-svn-src-stable-9@FreeBSD.ORG  Sun Jan  5 11:58:08 2014
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3C0422C9;
 Sun,  5 Jan 2014 11:58:08 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2799918C4;
 Sun,  5 Jan 2014 11:58:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s05Bw7L1045970;
 Sun, 5 Jan 2014 11:58:07 GMT (envelope-from luigi@svn.freebsd.org)
Received: (from luigi@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s05Bw7nq045969;
 Sun, 5 Jan 2014 11:58:07 GMT (envelope-from luigi@svn.freebsd.org)
Message-Id: <201401051158.s05Bw7nq045969@svn.freebsd.org>
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Sun, 5 Jan 2014 11:58:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r260318 - stable/9/sys/dev/e1000
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9/>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Jan 2014 11:58:08 -0000

Author: luigi
Date: Sun Jan  5 11:58:07 2014
New Revision: 260318
URL: http://svnweb.freebsd.org/changeset/base/260318

Log:
  MFC revision 259907
  use the correct netmap <-> nic slot mapping on the transmit ring for 'lem'.
  This bug would manifest only in netmap mode and on packets transmitted after
  a NIC reset while netmap mode is active.

Modified:
  stable/9/sys/dev/e1000/if_lem.c

Modified: stable/9/sys/dev/e1000/if_lem.c
==============================================================================
--- stable/9/sys/dev/e1000/if_lem.c	Sun Jan  5 10:52:57 2014	(r260317)
+++ stable/9/sys/dev/e1000/if_lem.c	Sun Jan  5 11:58:07 2014	(r260318)
@@ -2678,7 +2678,7 @@ lem_setup_transmit_structures(struct ada
 			void *addr;
 
 			addr = PNMB(slot + si, &paddr);
-			adapter->tx_desc_base[si].buffer_addr = htole64(paddr);
+			adapter->tx_desc_base[i].buffer_addr = htole64(paddr);
 			/* reload the map for netmap mode */
 			netmap_load_map(adapter->txtag, tx_buffer->map, addr);
 		}