From owner-svn-src-all@FreeBSD.ORG  Thu Dec 26 05:22:39 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@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 2586959D;
 Thu, 26 Dec 2013 05:22:39 +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 124451101;
 Thu, 26 Dec 2013 05:22:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBQ5McAY002010;
 Thu, 26 Dec 2013 05:22:38 GMT (envelope-from luigi@svn.freebsd.org)
Received: (from luigi@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBQ5McUS002009;
 Thu, 26 Dec 2013 05:22:38 GMT (envelope-from luigi@svn.freebsd.org)
Message-Id: <201312260522.rBQ5McUS002009@svn.freebsd.org>
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Thu, 26 Dec 2013 05:22:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r259907 - head/sys/dev/e1000
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Dec 2013 05:22:39 -0000

Author: luigi
Date: Thu Dec 26 05:22:38 2013
New Revision: 259907
URL: http://svnweb.freebsd.org/changeset/base/259907

Log:
  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.
  
  MFC after:	3 days

Modified:
  head/sys/dev/e1000/if_lem.c

Modified: head/sys/dev/e1000/if_lem.c
==============================================================================
--- head/sys/dev/e1000/if_lem.c	Thu Dec 26 04:24:08 2013	(r259906)
+++ head/sys/dev/e1000/if_lem.c	Thu Dec 26 05:22:38 2013	(r259907)
@@ -2679,7 +2679,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);
 		}