From owner-p4-projects@FreeBSD.ORG  Fri Feb  1 16:44:08 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 488F640B; Fri,  1 Feb 2013 16:44:08 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id B2B11409
 for <perforce@freebsd.org>; Fri,  1 Feb 2013 16:44:07 +0000 (UTC)
 (envelope-from bz@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A47B8132
 for <perforce@freebsd.org>; Fri,  1 Feb 2013 16:44:07 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r11Gi6CO063526
 for <perforce@freebsd.org>; Fri, 1 Feb 2013 16:44:06 GMT
 (envelope-from bz@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r11Gi69x063523
 for perforce@freebsd.org; Fri, 1 Feb 2013 16:44:06 GMT
 (envelope-from bz@freebsd.org)
Date: Fri, 1 Feb 2013 16:44:06 GMT
Message-Id: <201302011644.r11Gi69x063523@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 bz@freebsd.org using -f
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Subject: PERFORCE change 221678 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Feb 2013 16:44:08 -0000

http://p4web.freebsd.org/@@221678?ac=10

Change 221678 by bz@bz_zenith on 2013/02/01 16:43:54

	Do not allow users to disable polling if we cannot do interrupts.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/atse/if_atse.c#6 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/dev/altera/atse/if_atse.c#6 (text+ko) ====

@@ -1053,11 +1053,20 @@
 				ATSE_TX_INTR_DISABLE(sc);
 				ATSE_RX_EVENT_CLEAR(sc);
 				ATSE_TX_EVENT_CLEAR(sc);
-			} else {
+
+			/*
+			 * Do not allow disabling of polling if we do
+			 * not have interrupts.
+			 */
+			} else if (sc->atse_rx_irq_res != NULL ||
+			    sc->atse_tx_irq_res != NULL) {
 				error = ether_poll_deregister(ifp);
 				/* Enable interrupts. */
 				ATSE_RX_INTR_ENABLE(sc);
 				ATSE_TX_INTR_ENABLE(sc);
+			} else {
+				ifp->if_capenable ^= IFCAP_POLLING;
+				error = EINVAL;
 			}
 		}
 #endif /* DEVICE_POLLING */