From owner-svn-src-head@FreeBSD.ORG  Thu Apr 12 08:54:02 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 6A0CE106566B;
	Thu, 12 Apr 2012 08:54:02 +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 552048FC0C;
	Thu, 12 Apr 2012 08:54:02 +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 q3C8s2Ie018579;
	Thu, 12 Apr 2012 08:54:02 GMT (envelope-from luigi@svn.freebsd.org)
Received: (from luigi@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3C8s2XY018577;
	Thu, 12 Apr 2012 08:54:02 GMT (envelope-from luigi@svn.freebsd.org)
Message-Id: <201204120854.q3C8s2XY018577@svn.freebsd.org>
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Thu, 12 Apr 2012 08:54:02 +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: r234169 - head/sys/dev/netmap
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Thu, 12 Apr 2012 08:54:02 -0000

Author: luigi
Date: Thu Apr 12 08:54:01 2012
New Revision: 234169
URL: http://svn.freebsd.org/changeset/base/234169

Log:
  use correct selinfo pointer for the generic interrupt handler
  (it is never used in current FreeBSD drivers).

Modified:
  head/sys/dev/netmap/netmap.c

Modified: head/sys/dev/netmap/netmap.c
==============================================================================
--- head/sys/dev/netmap/netmap.c	Thu Apr 12 08:38:56 2012	(r234168)
+++ head/sys/dev/netmap/netmap.c	Thu Apr 12 08:54:01 2012	(r234169)
@@ -1667,10 +1667,10 @@ netmap_rx_irq(struct ifnet *ifp, int q, 
 	if (work_done) { /* RX path */
 		r = na->rx_rings + q;
 		r->nr_kflags |= NKR_PENDINTR;
-		main_wq = (na->num_rx_queues > 1) ? &na->tx_si : NULL;
+		main_wq = (na->num_rx_queues > 1) ? &na->rx_si : NULL;
 	} else { /* tx path */
 		r = na->tx_rings + q;
-		main_wq = (na->num_tx_queues > 1) ? &na->rx_si : NULL;
+		main_wq = (na->num_tx_queues > 1) ? &na->tx_si : NULL;
 		work_done = &q; /* dummy */
 	}
 	if (na->separate_locks) {