From owner-svn-src-head@FreeBSD.ORG  Mon Apr 29 16:58:22 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id D12A0839;
 Mon, 29 Apr 2013 16:58:22 +0000 (UTC)
 (envelope-from luigi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C3EDA1FFD;
 Mon, 29 Apr 2013 16:58:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3TGwMZm094558;
 Mon, 29 Apr 2013 16:58:22 GMT (envelope-from luigi@svn.freebsd.org)
Received: (from luigi@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3TGwMPe094557;
 Mon, 29 Apr 2013 16:58:22 GMT (envelope-from luigi@svn.freebsd.org)
Message-Id: <201304291658.r3TGwMPe094557@svn.freebsd.org>
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Mon, 29 Apr 2013 16:58:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r250049 - head/sys/dev/netmap
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 29 Apr 2013 16:58:22 -0000

Author: luigi
Date: Mon Apr 29 16:58:21 2013
New Revision: 250049
URL: http://svnweb.freebsd.org/changeset/base/250049

Log:
  explicitly mark some variables as const

Modified:
  head/sys/dev/netmap/ixgbe_netmap.h

Modified: head/sys/dev/netmap/ixgbe_netmap.h
==============================================================================
--- head/sys/dev/netmap/ixgbe_netmap.h	Mon Apr 29 15:58:04 2013	(r250048)
+++ head/sys/dev/netmap/ixgbe_netmap.h	Mon Apr 29 16:58:21 2013	(r250049)
@@ -226,7 +226,8 @@ ixgbe_netmap_txsync(struct ifnet *ifp, u
 	struct netmap_adapter *na = NA(adapter->ifp);
 	struct netmap_kring *kring = &na->tx_rings[ring_nr];
 	struct netmap_ring *ring = kring->ring;
-	u_int j, k = ring->cur, l, n = 0, lim = kring->nkr_num_slots - 1;
+	u_int j, l, n = 0;
+	u_int const k = ring->cur, lim = kring->nkr_num_slots - 1;
 
 	/*
 	 * ixgbe can generate an interrupt on every tx packet, but it
@@ -393,11 +394,10 @@ ring_reset:
 	    if (ix_use_dd) {
 		struct ixgbe_legacy_tx_desc *txd =
 		    (struct ixgbe_legacy_tx_desc *)txr->tx_base;
-
+		u_int k1 = netmap_idx_k2n(kring, kring->nr_hwcur);
 		l = txr->next_to_clean;
-		k = netmap_idx_k2n(kring, kring->nr_hwcur);
 		delta = 0;
-		while (l != k &&
+		while (l != k1 &&
 		    txd[l].upper.fields.status & IXGBE_TXD_STAT_DD) {
 		    delta++;
 		    l = (l == lim) ? 0 : l + 1;