PERFORCE change 135681 for review

[Andrew Thompson]

http://perforce.freebsd.org/chv.cgi?CH=135681

Change 135681 by thompsa at thompsa_heff on 2008/02/18 22:20:57

	Remove the mbuf from the send queue early on as ieee80211_cancel_scan()
	will reenter wpi_start causing the mbuf to be sent and disappear from
	the queue.

Affected files ...

.. //depot/projects/wifi/sys/dev/wpi/if_wpi.c#5 edit

Differences ...

==== //depot/projects/wifi/sys/dev/wpi/if_wpi.c#5 (text+ko) ====

@@ -2196,7 +2196,7 @@
 			if (ic->ic_state != IEEE80211_S_RUN)
 				break;
 
-			IFQ_POLL(&ifp->if_snd, m0);
+			IFQ_DRV_DEQUEUE(&ifp->if_snd, m0);
 			if (m0 == NULL)
 				break;
 
@@ -2238,7 +2238,6 @@
 				break;
 			}
 
-			IFQ_DRV_DEQUEUE(&ifp->if_snd, m0);
 			BPF_MTAP(ifp, m0);
 
 			m0 = ieee80211_encap(ic, m0, ni);