From 5774863da21e886dcb42a8c75388e2ed4dbec113 Mon Sep 17 00:00:00 2001
From: Jonathan Gray <jsg@cvs.openbsd.org>
Date: Sun, 6 Feb 2005 07:08:25 +0000
Subject: Fix a merge error that was causing a panic after associating. Thanks
 to mcbride@ for pointing me in the right direction.

---
 sys/dev/ic/rtw.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/dev/ic/rtw.c b/sys/dev/ic/rtw.c
index 9881592912b..9115ff8f7e2 100644
--- a/sys/dev/ic/rtw.c
+++ b/sys/dev/ic/rtw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtw.c,v 1.11 2005/01/22 11:22:17 jsg Exp $	*/
+/*	$OpenBSD: rtw.c,v 1.12 2005/02/06 07:08:24 jsg Exp $	*/
 /* $NetBSD: rtw.c,v 1.29 2004/12/27 19:49:16 dyoung Exp $ */
 /*-
  * Copyright (c) 2004, 2005 David Young.  All rights reserved.
@@ -2543,7 +2543,7 @@ rtw_dequeue(struct ifnet *ifp, struct rtw_txsoft_blk **tsbp,
 		DPRINTF(sc, RTW_DEBUG_XMIT,
 		    ("%s: dequeue pwrsave frame\n", __func__));
 	} else {
-		IFQ_POLL(&ifp->if_snd, m0);
+		IFQ_DEQUEUE(&ifp->if_snd, m0);
 		if (m0 == NULL) {
 			DPRINTF(sc, RTW_DEBUG_XMIT,
 			    ("%s: no frame\n", __func__));
-- 
cgit v1.2.3