From owner-p4-projects@FreeBSD.ORG  Sun Mar 16 16:15:09 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A21A21065677; Sun, 16 Mar 2008 16:15:08 +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 617AA1065675
	for <perforce@freebsd.org>; Sun, 16 Mar 2008 16:15:08 +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 533998FC1D
	for <perforce@freebsd.org>; Sun, 16 Mar 2008 16:15:08 +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 m2GGF8Wf088362
	for <perforce@freebsd.org>; Sun, 16 Mar 2008 16:15:08 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2GGF89o088360
	for perforce@freebsd.org; Sun, 16 Mar 2008 16:15:08 GMT
	(envelope-from sam@freebsd.org)
Date: Sun, 16 Mar 2008 16:15:08 GMT
Message-Id: <200803161615.m2GGF89o088360@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 137838 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: Sun, 16 Mar 2008 16:15:09 -0000

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

Change 137838 by sam@sam_ebb on 2008/03/16 16:14:30

	honor protection in the raw xmit path

Affected files ...

.. //depot/projects/vap/sys/dev/usb/if_ural.c#15 edit

Differences ...

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

@@ -1403,7 +1403,20 @@
 		m_freem(m0);
 		return EINVAL;
 	}
-	/* XXX honor protection */
+	flags = 0;
+	if ((params->ibp_flags & IEEE80211_BPF_NOACK) == 0)
+		flags |= RAL_TX_ACK;
+	if (params->ibp_flags & (IEEE80211_BPF_RTS|IEEE80211_BPF_CTS)) {
+		error = ural_sendprot(sc, m0, ni,
+		    params->ibp_flags & IEEE80211_BPF_RTS ?
+			 IEEE80211_PROT_RTSCTS : IEEE80211_PROT_CTSONLY,
+		    rate);
+		if (error) {
+			m_freem(m0);
+			return error;
+		}
+		flags |= RAL_TX_IFS_SIFS;
+	}
 
 	if (bpf_peers_present(ifp->if_bpf)) {
 		struct ural_tx_radiotap_header *tap = &sc->sc_txtap;
@@ -1420,10 +1433,6 @@
 	data->m = m0;
 	data->ni = ni;
 
-	flags = 0;
-	if ((params->ibp_flags & IEEE80211_BPF_NOACK) == 0)
-		flags |= RAL_TX_ACK;
-
 	m_copydata(m0, 0, m0->m_pkthdr.len, data->buf + RAL_TX_DESC_SIZE);
 	/* XXX need to setup descriptor ourself */
 	ural_setup_tx_desc(sc, desc, flags, m0->m_pkthdr.len, rate);