From owner-p4-projects@FreeBSD.ORG  Fri Apr  4 16:38:23 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D0DE8106566B; Fri,  4 Apr 2008 16:38:23 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 92D041065674
	for <perforce@freebsd.org>; Fri,  4 Apr 2008 16:38:23 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 874348FC1F
	for <perforce@freebsd.org>; Fri,  4 Apr 2008 16:38:23 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m34GcNX0070876
	for <perforce@freebsd.org>; Fri, 4 Apr 2008 16:38:23 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m34GcNUs070874
	for perforce@freebsd.org; Fri, 4 Apr 2008 16:38:23 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 4 Apr 2008 16:38:23 GMT
Message-Id: <200804041638.m34GcNUs070874@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 139345 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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, 04 Apr 2008 16:38:24 -0000

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

Change 139345 by sam@sam_ebb on 2008/04/04 16:38:01

	hack raw xmit path to handle mgt frames; still get firmware
	errors negotiating wpa

Affected files ...

.. //depot/projects/vap/sys/dev/iwi/if_iwi.c#15 edit

Differences ...

==== //depot/projects/vap/sys/dev/iwi/if_iwi.c#15 (text+ko) ====

@@ -157,6 +157,8 @@
 static void	iwi_write_ibssnode(struct iwi_softc *, const u_int8_t [], int);
 static int	iwi_tx_start(struct ifnet *, struct mbuf *,
 		    struct ieee80211_node *, int);
+static int	iwi_raw_xmit(struct ieee80211_node *, struct mbuf *,
+		    const struct ieee80211_bpf_params *);
 static void	iwi_start(struct ifnet *);
 static void	iwi_watchdog(void *);
 static int	iwi_ioctl(struct ifnet *, u_long, caddr_t);
@@ -402,6 +404,7 @@
 	ic->ic_node_alloc = iwi_node_alloc;
 	sc->sc_node_free = ic->ic_node_free;
 	ic->ic_node_free = iwi_node_free;
+	ic->ic_raw_xmit = iwi_raw_xmit;
 	ic->ic_scan_start = iwi_scan_start;
 	ic->ic_scan_end = iwi_scan_end;
 	ic->ic_set_channel = iwi_set_channel;
@@ -1872,6 +1875,49 @@
 	return 0;
 }
 
+static int
+iwi_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
+	const struct ieee80211_bpf_params *params)
+{
+	struct ieee80211com *ic = ni->ni_ic;
+	struct ifnet *ifp = ic->ic_ifp;
+	struct iwi_softc *sc = ifp->if_softc;
+	int ac;
+	IWI_LOCK_DECL;
+
+	IWI_LOCK(sc);
+
+	/* prevent management frames from being sent if we're not ready */
+	if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) {
+		IWI_UNLOCK(sc);
+		m_freem(m);
+		ieee80211_free_node(ni);
+		return ENETDOWN;
+	}
+	ac = M_WME_GETAC(m);
+	if (sc->txq[ac].queued > IWI_TX_RING_COUNT - 8) {
+		ifp->if_drv_flags |= IFF_DRV_OACTIVE;
+		IWI_UNLOCK(sc);
+		m_freem(m);
+		ieee80211_free_node(ni);
+		return ENOBUFS;		/* XXX */
+	}
+
+	BPF_MTAP(ifp, m);
+
+	/* XXX honor params */
+	if (iwi_tx_start(ifp, m, ni, ac) != 0) {
+		ieee80211_free_node(ni);
+		ifp->if_oerrors++;
+		IWI_UNLOCK(sc);
+		return EIO;
+	}
+
+	IWI_UNLOCK(sc);
+
+	return 0;
+}
+
 static void
 iwi_start(struct ifnet *ifp)
 {