From owner-svn-src-all@FreeBSD.ORG  Mon Feb 17 01:37:02 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6B501773;
 Mon, 17 Feb 2014 01:37:02 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5186211E4;
 Mon, 17 Feb 2014 01:37:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1H1b2em063713;
 Mon, 17 Feb 2014 01:37:02 GMT (envelope-from kevlo@svn.freebsd.org)
Received: (from kevlo@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1H1aruu063646;
 Mon, 17 Feb 2014 01:36:53 GMT (envelope-from kevlo@svn.freebsd.org)
Message-Id: <201402170136.s1H1aruu063646@svn.freebsd.org>
From: Kevin Lo <kevlo@FreeBSD.org>
Date: Mon, 17 Feb 2014 01:36:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r262007 - in stable/10: contrib/libpcap share/man/man9
 sys/dev/ath sys/dev/bwi sys/dev/bwn sys/dev/ipw sys/dev/iwi sys/dev/iwn
 sys/dev/malo sys/dev/mwl sys/dev/ral sys/dev/usb/wlan sys/...
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Feb 2014 01:37:02 -0000

Author: kevlo
Date: Mon Feb 17 01:36:53 2014
New Revision: 262007
URL: http://svnweb.freebsd.org/changeset/base/262007

Log:
  MFC r260444:
  
  Rename definition of IEEE80211_FC1_WEP to IEEE80211_FC1_PROTECTED.
  
  The origin of WEP comes from IEEE Std 802.11-1997 where it defines
  whether the frame body of MAC frame has been encrypted using WEP
  algorithm or not.
  IEEE Std. 802.11-2007 changes WEP to Protected Frame, indicates
  whether the frame is protected by a cryptographic encapsulation
  algorithm.
  
  Reviewed by:	adrian, rpaulo

Modified:
  stable/10/contrib/libpcap/ieee80211.h
  stable/10/share/man/man9/ieee80211_crypto.9
  stable/10/sys/dev/ath/if_ath_tx.c
  stable/10/sys/dev/bwi/if_bwi.c
  stable/10/sys/dev/bwn/if_bwn.c
  stable/10/sys/dev/ipw/if_ipw.c
  stable/10/sys/dev/iwi/if_iwi.c
  stable/10/sys/dev/iwn/if_iwn.c
  stable/10/sys/dev/malo/if_malo.c
  stable/10/sys/dev/mwl/if_mwl.c
  stable/10/sys/dev/ral/rt2560.c
  stable/10/sys/dev/ral/rt2661.c
  stable/10/sys/dev/ral/rt2860.c
  stable/10/sys/dev/usb/wlan/if_rsu.c
  stable/10/sys/dev/usb/wlan/if_rum.c
  stable/10/sys/dev/usb/wlan/if_run.c
  stable/10/sys/dev/usb/wlan/if_uath.c
  stable/10/sys/dev/usb/wlan/if_upgt.c
  stable/10/sys/dev/usb/wlan/if_ural.c
  stable/10/sys/dev/usb/wlan/if_urtw.c
  stable/10/sys/dev/usb/wlan/if_urtwn.c
  stable/10/sys/dev/usb/wlan/if_zyd.c
  stable/10/sys/dev/wi/if_wi.c
  stable/10/sys/dev/wpi/if_wpi.c
  stable/10/sys/net80211/ieee80211.h
  stable/10/sys/net80211/ieee80211_adhoc.c
  stable/10/sys/net80211/ieee80211_hostap.c
  stable/10/sys/net80211/ieee80211_mesh.c
  stable/10/sys/net80211/ieee80211_output.c
  stable/10/sys/net80211/ieee80211_proto.c
  stable/10/sys/net80211/ieee80211_sta.c
  stable/10/sys/net80211/ieee80211_wds.c
  stable/10/tools/tools/net80211/stumbler/stumbler.c
  stable/10/tools/tools/net80211/w00t/ap/ap.c
  stable/10/tools/tools/net80211/w00t/assoc/assoc.c
  stable/10/tools/tools/net80211/w00t/expand/expand.c
  stable/10/tools/tools/net80211/w00t/prga/prga.c
  stable/10/tools/tools/net80211/w00t/redir/redir.c
  stable/10/tools/tools/net80211/wesside/wesside/wesside.c
  stable/10/tools/tools/net80211/wlaninject/wlaninject.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/libpcap/ieee80211.h
==============================================================================
--- stable/10/contrib/libpcap/ieee80211.h	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/contrib/libpcap/ieee80211.h	Mon Feb 17 01:36:53 2014	(r262007)
@@ -90,7 +90,7 @@
 #define	IEEE80211_FC1_RETRY			0x08
 #define	IEEE80211_FC1_PWR_MGT			0x10
 #define	IEEE80211_FC1_MORE_DATA			0x20
-#define	IEEE80211_FC1_WEP			0x40
+#define	IEEE80211_FC1_PROTECTED			0x40
 #define	IEEE80211_FC1_ORDER			0x80
 
 #define	IEEE80211_SEQ_FRAG_MASK			0x000f

Modified: stable/10/share/man/man9/ieee80211_crypto.9
==============================================================================
--- stable/10/share/man/man9/ieee80211_crypto.9	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/share/man/man9/ieee80211_crypto.9	Mon Feb 17 01:36:53 2014	(r262007)
@@ -236,7 +236,7 @@ For receive, drivers mark frames with th
 .Dv M_WEP
 mbuf flag to indicate the hardware has decrypted the payload.
 If frames have the
-.Dv IEEE80211_FC1_WEP
+.Dv IEEE80211_FC1_PROTECTED
 bit marked in their 802.11 header and are not tagged with
 .Dv M_WEP
 then decryption is done in software.

Modified: stable/10/sys/dev/ath/if_ath_tx.c
==============================================================================
--- stable/10/sys/dev/ath/if_ath_tx.c	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/sys/dev/ath/if_ath_tx.c	Mon Feb 17 01:36:53 2014	(r262007)
@@ -1584,7 +1584,7 @@ ath_tx_normal_setup(struct ath_softc *sc
 	ATH_TX_LOCK_ASSERT(sc);
 
 	wh = mtod(m0, struct ieee80211_frame *);
-	iswep = wh->i_fc[1] & IEEE80211_FC1_WEP;
+	iswep = wh->i_fc[1] & IEEE80211_FC1_PROTECTED;
 	ismcast = IEEE80211_IS_MULTICAST(wh->i_addr1);
 	isfrag = m0->m_flags & M_FRAG;
 	hdrlen = ieee80211_anyhdrsize(wh);
@@ -2214,7 +2214,7 @@ ath_tx_raw_start(struct ath_softc *sc, s
 
 		sc->sc_tx_th.wt_tsf = htole64(tsf);
 		sc->sc_tx_th.wt_flags = sc->sc_hwmap[rix].txflags;
-		if (wh->i_fc[1] & IEEE80211_FC1_WEP)
+		if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED)
 			sc->sc_tx_th.wt_flags |= IEEE80211_RADIOTAP_F_WEP;
 		if (m0->m_flags & M_FRAG)
 			sc->sc_tx_th.wt_flags |= IEEE80211_RADIOTAP_F_FRAG;

Modified: stable/10/sys/dev/bwi/if_bwi.c
==============================================================================
--- stable/10/sys/dev/bwi/if_bwi.c	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/sys/dev/bwi/if_bwi.c	Mon Feb 17 01:36:53 2014	(r262007)
@@ -1395,7 +1395,7 @@ bwi_start_locked(struct ifnet *ifp)
 
 		ni = (struct ieee80211_node *) m->m_pkthdr.rcvif;
 		wh = mtod(m, struct ieee80211_frame *);
-		if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+		if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 			k = ieee80211_crypto_encap(ni, m);
 			if (k == NULL) {
 				ieee80211_free_node(ni);
@@ -3000,7 +3000,7 @@ bwi_encap(struct bwi_softc *sc, int idx,
 	 */
 	if (ieee80211_radiotap_active_vap(vap)) {
 		sc->sc_tx_th.wt_flags = 0;
-		if (wh->i_fc[1] & IEEE80211_FC1_WEP)
+		if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED)
 			sc->sc_tx_th.wt_flags |= IEEE80211_RADIOTAP_F_WEP;
 		if (ieee80211_rate2phytype(sc->sc_rates, rate) == IEEE80211_T_DS &&
 		    (ic->ic_flags & IEEE80211_F_SHPREAMBLE) &&
@@ -3183,7 +3183,7 @@ bwi_encap_raw(struct bwi_softc *sc, int 
 	if (ieee80211_radiotap_active_vap(vap)) {
 		sc->sc_tx_th.wt_flags = 0;
 		/* XXX IEEE80211_BPF_CRYPTO */
-		if (wh->i_fc[1] & IEEE80211_FC1_WEP)
+		if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED)
 			sc->sc_tx_th.wt_flags |= IEEE80211_RADIOTAP_F_WEP;
 		if (params->ibp_flags & IEEE80211_BPF_SHORTPRE)
 			sc->sc_tx_th.wt_flags |= IEEE80211_RADIOTAP_F_SHORTPRE;
@@ -3819,7 +3819,7 @@ bwi_rx_radiotap(struct bwi_softc *sc, st
 		sc->sc_rx_th.wr_flags |= IEEE80211_RADIOTAP_F_SHORTPRE;
 
 	wh = mtod(m, const struct ieee80211_frame_min *);
-	if (wh->i_fc[1] & IEEE80211_FC1_WEP)
+	if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED)
 		sc->sc_rx_th.wr_flags |= IEEE80211_RADIOTAP_F_WEP;
 
 	sc->sc_rx_th.wr_tsf = hdr->rxh_tsf; /* No endian convertion */

Modified: stable/10/sys/dev/bwn/if_bwn.c
==============================================================================
--- stable/10/sys/dev/bwn/if_bwn.c	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/sys/dev/bwn/if_bwn.c	Mon Feb 17 01:36:53 2014	(r262007)
@@ -1316,7 +1316,7 @@ bwn_start_locked(struct ifnet *ifp)
 		}
 		KASSERT(ni != NULL, ("%s:%d: fail", __func__, __LINE__));
 		wh = mtod(m, struct ieee80211_frame *);
-		if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+		if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 			k = ieee80211_crypto_encap(ni, m);
 			if (k == NULL) {
 				ieee80211_free_node(ni);
@@ -9780,7 +9780,7 @@ bwn_set_txhdr(struct bwn_mac *mac, struc
 	 */
 	if (ieee80211_radiotap_active_vap(vap)) {
 		sc->sc_tx_th.wt_flags = 0;
-		if (wh->i_fc[1] & IEEE80211_FC1_WEP)
+		if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED)
 			sc->sc_tx_th.wt_flags |= IEEE80211_RADIOTAP_F_WEP;
 		if (isshort &&
 		    (rate == BWN_CCK_RATE_2MB || rate == BWN_CCK_RATE_5MB ||
@@ -10319,7 +10319,7 @@ bwn_rx_radiotap(struct bwn_mac *mac, str
 		sc->sc_rx_th.wr_flags |= IEEE80211_RADIOTAP_F_SHORTPRE;
 
 	wh = mtod(m, const struct ieee80211_frame_min *);
-	if (wh->i_fc[1] & IEEE80211_FC1_WEP)
+	if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED)
 		sc->sc_rx_th.wr_flags |= IEEE80211_RADIOTAP_F_WEP;
 
 	bwn_tsf_read(mac, &tsf);

Modified: stable/10/sys/dev/ipw/if_ipw.c
==============================================================================
--- stable/10/sys/dev/ipw/if_ipw.c	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/sys/dev/ipw/if_ipw.c	Mon Feb 17 01:36:53 2014	(r262007)
@@ -1604,7 +1604,7 @@ ipw_tx_start(struct ifnet *ifp, struct m
 
 	wh = mtod(m0, struct ieee80211_frame *);
 
-	if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+	if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 		k = ieee80211_crypto_encap(ni, m0);
 		if (k == NULL) {
 			m_freem(m0);
@@ -1628,7 +1628,7 @@ ipw_tx_start(struct ifnet *ifp, struct m
 
 	shdr->hdr.type = htole32(IPW_HDR_TYPE_SEND);
 	shdr->hdr.subtype = 0;
-	shdr->hdr.encrypted = (wh->i_fc[1] & IEEE80211_FC1_WEP) ? 1 : 0;
+	shdr->hdr.encrypted = (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) ? 1 : 0;
 	shdr->hdr.encrypt = 0;
 	shdr->hdr.keyidx = 0;
 	shdr->hdr.keysz = 0;

Modified: stable/10/sys/dev/iwi/if_iwi.c
==============================================================================
--- stable/10/sys/dev/iwi/if_iwi.c	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/sys/dev/iwi/if_iwi.c	Mon Feb 17 01:36:53 2014	(r262007)
@@ -1849,7 +1849,7 @@ iwi_tx_start(struct ifnet *ifp, struct m
 	} else
 		staid = 0;
 
-	if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+	if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 		k = ieee80211_crypto_encap(ni, m0);
 		if (k == NULL) {
 			m_freem(m0);

Modified: stable/10/sys/dev/iwn/if_iwn.c
==============================================================================
--- stable/10/sys/dev/iwn/if_iwn.c	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/sys/dev/iwn/if_iwn.c	Mon Feb 17 01:36:53 2014	(r262007)
@@ -3623,7 +3623,7 @@ iwn_tx_data(struct iwn_softc *sc, struct
 	    rate & IEEE80211_RATE_VAL);
 
 	/* Encrypt the frame if need be. */
-	if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+	if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 		/* Retrieve key for TX. */
 		k = ieee80211_crypto_encap(ni, m);
 		if (k == NULL) {

Modified: stable/10/sys/dev/malo/if_malo.c
==============================================================================
--- stable/10/sys/dev/malo/if_malo.c	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/sys/dev/malo/if_malo.c	Mon Feb 17 01:36:53 2014	(r262007)
@@ -1101,7 +1101,7 @@ malo_tx_start(struct malo_softc *sc, str
 	uint16_t qos;
 
 	wh = mtod(m0, struct ieee80211_frame *);
-	iswep = wh->i_fc[1] & IEEE80211_FC1_WEP;
+	iswep = wh->i_fc[1] & IEEE80211_FC1_PROTECTED;
 	ismcast = IEEE80211_IS_MULTICAST(wh->i_addr1);
 	copyhdrlen = hdrlen = ieee80211_anyhdrsize(wh);
 	pktlen = m0->m_pkthdr.len;

Modified: stable/10/sys/dev/mwl/if_mwl.c
==============================================================================
--- stable/10/sys/dev/mwl/if_mwl.c	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/sys/dev/mwl/if_mwl.c	Mon Feb 17 01:36:53 2014	(r262007)
@@ -2885,12 +2885,13 @@ mwl_rx_proc(void *arg, int npending)
 		 * upper layer to put a station in power save
 		 * (except when configured with MWL_HOST_PS_SUPPORT).
 		 */
-		if (wh->i_fc[1] & IEEE80211_FC1_WEP)
+		if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED)
 			m->m_flags |= M_WEP;
 #ifdef MWL_HOST_PS_SUPPORT
-		wh->i_fc[1] &= ~IEEE80211_FC1_WEP;
+		wh->i_fc[1] &= ~IEEE80211_FC1_PROTECTED;
 #else
-		wh->i_fc[1] &= ~(IEEE80211_FC1_WEP | IEEE80211_FC1_PWR_MGT);
+		wh->i_fc[1] &= ~(IEEE80211_FC1_PROTECTED |
+		    IEEE80211_FC1_PWR_MGT);
 #endif
 
 		if (ieee80211_radiotap_active(ic)) {
@@ -3204,7 +3205,7 @@ mwl_tx_start(struct mwl_softc *sc, struc
 #endif
 
 	wh = mtod(m0, struct ieee80211_frame *);
-	iswep = wh->i_fc[1] & IEEE80211_FC1_WEP;
+	iswep = wh->i_fc[1] & IEEE80211_FC1_PROTECTED;
 	ismcast = IEEE80211_IS_MULTICAST(wh->i_addr1);
 	hdrlen = ieee80211_anyhdrsize(wh);
 	copyhdrlen = hdrlen;

Modified: stable/10/sys/dev/ral/rt2560.c
==============================================================================
--- stable/10/sys/dev/ral/rt2560.c	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/sys/dev/ral/rt2560.c	Mon Feb 17 01:36:53 2014	(r262007)
@@ -1557,7 +1557,7 @@ rt2560_tx_mgt(struct rt2560_softc *sc, s
 
 	wh = mtod(m0, struct ieee80211_frame *);
 
-	if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+	if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 		k = ieee80211_crypto_encap(ni, m0);
 		if (k == NULL) {
 			m_freem(m0);
@@ -1803,7 +1803,7 @@ rt2560_tx_data(struct rt2560_softc *sc, 
 		rate = ni->ni_txrate;
 	}
 
-	if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+	if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 		k = ieee80211_crypto_encap(ni, m0);
 		if (k == NULL) {
 			m_freem(m0);

Modified: stable/10/sys/dev/ral/rt2661.c
==============================================================================
--- stable/10/sys/dev/ral/rt2661.c	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/sys/dev/ral/rt2661.c	Mon Feb 17 01:36:53 2014	(r262007)
@@ -1318,7 +1318,7 @@ rt2661_tx_mgt(struct rt2661_softc *sc, s
 
 	wh = mtod(m0, struct ieee80211_frame *);
 
-	if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+	if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 		k = ieee80211_crypto_encap(ni, m0);
 		if (k == NULL) {
 			m_freem(m0);
@@ -1493,7 +1493,7 @@ rt2661_tx_data(struct rt2661_softc *sc, 
 		noack = cap->cap_wmeParams[ac].wmep_noackPolicy;
 	}
 
-	if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+	if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 		k = ieee80211_crypto_encap(ni, m0);
 		if (k == NULL) {
 			m_freem(m0);

Modified: stable/10/sys/dev/ral/rt2860.c
==============================================================================
--- stable/10/sys/dev/ral/rt2860.c	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/sys/dev/ral/rt2860.c	Mon Feb 17 01:36:53 2014	(r262007)
@@ -1284,9 +1284,9 @@ rt2860_rx_intr(struct rt2860_softc *sc)
 
 		wh = mtod(m, struct ieee80211_frame *);
 #ifdef HW_CRYPTO
-		if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+		if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 			/* frame is decrypted by hardware */
-			wh->i_fc[1] &= ~IEEE80211_FC1_WEP;
+			wh->i_fc[1] &= ~IEEE80211_FC1_PROTECTED;
 		}
 #endif
 
@@ -1492,7 +1492,7 @@ rt2860_tx(struct rt2860_softc *sc, struc
 
 	wh = mtod(m, struct ieee80211_frame *);
 
-	if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+	if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 		k = ieee80211_crypto_encap(ni, m);
 		if (k == NULL) {
 			m_freem(m);

Modified: stable/10/sys/dev/usb/wlan/if_rsu.c
==============================================================================
--- stable/10/sys/dev/usb/wlan/if_rsu.c	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/sys/dev/usb/wlan/if_rsu.c	Mon Feb 17 01:36:53 2014	(r262007)
@@ -1669,7 +1669,7 @@ rsu_tx_start(struct rsu_softc *sc, struc
 	wh = mtod(m0, struct ieee80211_frame *);
 	type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK;
 
-	if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+	if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 		k = ieee80211_crypto_encap(ni, m0);
 		if (k == NULL) {
 			device_printf(sc->sc_dev,

Modified: stable/10/sys/dev/usb/wlan/if_rum.c
==============================================================================
--- stable/10/sys/dev/usb/wlan/if_rum.c	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/sys/dev/usb/wlan/if_rum.c	Mon Feb 17 01:36:53 2014	(r262007)
@@ -1120,7 +1120,7 @@ rum_tx_mgt(struct rum_softc *sc, struct 
 	sc->tx_nfree--;
 
 	wh = mtod(m0, struct ieee80211_frame *);
-	if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+	if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 		k = ieee80211_crypto_encap(ni, m0);
 		if (k == NULL) {
 			m_freem(m0);
@@ -1238,7 +1238,7 @@ rum_tx_data(struct rum_softc *sc, struct
 	else
 		rate = ni->ni_txrate;
 
-	if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+	if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 		k = ieee80211_crypto_encap(ni, m0);
 		if (k == NULL) {
 			m_freem(m0);

Modified: stable/10/sys/dev/usb/wlan/if_run.c
==============================================================================
--- stable/10/sys/dev/usb/wlan/if_run.c	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/sys/dev/usb/wlan/if_run.c	Mon Feb 17 01:36:53 2014	(r262007)
@@ -2793,8 +2793,8 @@ run_rx_frame(struct run_softc *sc, struc
 
 	wh = mtod(m, struct ieee80211_frame *);
 
-	if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
-		wh->i_fc[1] &= ~IEEE80211_FC1_WEP;
+	if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
+		wh->i_fc[1] &= ~IEEE80211_FC1_PROTECTED;
 		m->m_flags |= M_WEP;
 	}
 

Modified: stable/10/sys/dev/usb/wlan/if_uath.c
==============================================================================
--- stable/10/sys/dev/usb/wlan/if_uath.c	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/sys/dev/usb/wlan/if_uath.c	Mon Feb 17 01:36:53 2014	(r262007)
@@ -1625,7 +1625,7 @@ uath_tx_start(struct uath_softc *sc, str
 	}
 
 	wh = mtod(m0, struct ieee80211_frame *);
-	if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+	if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 		k = ieee80211_crypto_encap(ni, m0);
 		if (k == NULL) {
 			m_freem(m0);

Modified: stable/10/sys/dev/usb/wlan/if_upgt.c
==============================================================================
--- stable/10/sys/dev/usb/wlan/if_upgt.c	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/sys/dev/usb/wlan/if_upgt.c	Mon Feb 17 01:36:53 2014	(r262007)
@@ -2222,7 +2222,7 @@ upgt_tx_start(struct upgt_softc *sc, str
 	 * Software crypto.
 	 */
 	wh = mtod(m, struct ieee80211_frame *);
-	if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+	if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 		k = ieee80211_crypto_encap(ni, m);
 		if (k == NULL) {
 			device_printf(sc->sc_dev,

Modified: stable/10/sys/dev/usb/wlan/if_ural.c
==============================================================================
--- stable/10/sys/dev/usb/wlan/if_ural.c	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/sys/dev/usb/wlan/if_ural.c	Mon Feb 17 01:36:53 2014	(r262007)
@@ -1119,7 +1119,7 @@ ural_tx_mgt(struct ural_softc *sc, struc
 	tp = &vap->iv_txparms[ieee80211_chan2mode(ic->ic_curchan)];
 
 	wh = mtod(m0, struct ieee80211_frame *);
-	if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+	if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 		k = ieee80211_crypto_encap(ni, m0);
 		if (k == NULL) {
 			m_freem(m0);
@@ -1288,7 +1288,7 @@ ural_tx_data(struct ural_softc *sc, stru
 	else
 		rate = ni->ni_txrate;
 
-	if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+	if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 		k = ieee80211_crypto_encap(ni, m0);
 		if (k == NULL) {
 			m_freem(m0);

Modified: stable/10/sys/dev/usb/wlan/if_urtw.c
==============================================================================
--- stable/10/sys/dev/usb/wlan/if_urtw.c	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/sys/dev/usb/wlan/if_urtw.c	Mon Feb 17 01:36:53 2014	(r262007)
@@ -1696,7 +1696,7 @@ urtw_tx_start(struct urtw_softc *sc, str
 	/*
 	 * Software crypto.
 	 */
-	if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+	if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 		k = ieee80211_crypto_encap(ni, m0);
 		if (k == NULL) {
 			device_printf(sc->sc_dev,

Modified: stable/10/sys/dev/usb/wlan/if_urtwn.c
==============================================================================
--- stable/10/sys/dev/usb/wlan/if_urtwn.c	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/sys/dev/usb/wlan/if_urtwn.c	Mon Feb 17 01:36:53 2014	(r262007)
@@ -1596,7 +1596,7 @@ urtwn_tx_start(struct urtwn_softc *sc, s
 	 * Software crypto.
 	 */
 	wh = mtod(m0, struct ieee80211_frame *);
-	if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+	if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 		k = ieee80211_crypto_encap(ni, m0);
 		if (k == NULL) {
 			device_printf(sc->sc_dev,

Modified: stable/10/sys/dev/usb/wlan/if_zyd.c
==============================================================================
--- stable/10/sys/dev/usb/wlan/if_zyd.c	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/sys/dev/usb/wlan/if_zyd.c	Mon Feb 17 01:36:53 2014	(r262007)
@@ -2506,7 +2506,7 @@ zyd_tx_start(struct zyd_softc *sc, struc
 		}
 	}
 
-	if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+	if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 		k = ieee80211_crypto_encap(ni, m0);
 		if (k == NULL) {
 			m_freem(m0);

Modified: stable/10/sys/dev/wi/if_wi.c
==============================================================================
--- stable/10/sys/dev/wi/if_wi.c	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/sys/dev/wi/if_wi.c	Mon Feb 17 01:36:53 2014	(r262007)
@@ -1003,7 +1003,7 @@ wi_start_locked(struct ifnet *ifp)
 		    mtod(m0, const uint8_t *) + ieee80211_hdrsize(wh));
 		frmhdr.wi_ehdr.ether_type = llc->llc_snap.ether_type;
 		frmhdr.wi_tx_ctl = htole16(WI_ENC_TX_802_11|WI_TXCNTL_TX_EX);
-		if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+		if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 			k = ieee80211_crypto_encap(ni, m0);
 			if (k == NULL) {
 				ieee80211_free_node(ni);
@@ -1106,7 +1106,7 @@ wi_raw_xmit(struct ieee80211_node *ni, s
 	frmhdr.wi_tx_ctl = htole16(WI_ENC_TX_802_11|WI_TXCNTL_TX_EX);
 	if (params && (params->ibp_flags & IEEE80211_BPF_NOACK))
 		frmhdr.wi_tx_ctl |= htole16(WI_TXCNTL_ALTRTRY);
-	if ((wh->i_fc[1] & IEEE80211_FC1_WEP) &&
+	if ((wh->i_fc[1] & IEEE80211_FC1_PROTECTED) &&
 	    (!params || (params && (params->ibp_flags & IEEE80211_BPF_CRYPTO)))) {
 		k = ieee80211_crypto_encap(ni, m0);
 		if (k == NULL) {

Modified: stable/10/sys/dev/wpi/if_wpi.c
==============================================================================
--- stable/10/sys/dev/wpi/if_wpi.c	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/sys/dev/wpi/if_wpi.c	Mon Feb 17 01:36:53 2014	(r262007)
@@ -1886,7 +1886,7 @@ wpi_tx_data(struct wpi_softc *sc, struct
 	hdrlen = ieee80211_hdrsize(wh);
 	ismcast = IEEE80211_IS_MULTICAST(wh->i_addr1);
 
-	if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+	if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 		k = ieee80211_crypto_encap(ni, m0);
 		if (k == NULL) {
 			m_freem(m0);
@@ -1955,7 +1955,7 @@ wpi_tx_data(struct wpi_softc *sc, struct
 		tap->wt_flags = 0;
 		tap->wt_rate = rate;
 		tap->wt_hwqueue = ac;
-		if (wh->i_fc[1] & IEEE80211_FC1_WEP)
+		if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED)
 			tap->wt_flags |= IEEE80211_RADIOTAP_F_WEP;
 
 		ieee80211_radiotap_tx(vap, m0);

Modified: stable/10/sys/net80211/ieee80211.h
==============================================================================
--- stable/10/sys/net80211/ieee80211.h	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/sys/net80211/ieee80211.h	Mon Feb 17 01:36:53 2014	(r262007)
@@ -166,7 +166,7 @@ struct ieee80211_qosframe_addr4 {
 #define	IEEE80211_FC1_RETRY			0x08
 #define	IEEE80211_FC1_PWR_MGT			0x10
 #define	IEEE80211_FC1_MORE_DATA			0x20
-#define	IEEE80211_FC1_WEP			0x40
+#define	IEEE80211_FC1_PROTECTED			0x40
 #define	IEEE80211_FC1_ORDER			0x80
 
 #define	IEEE80211_SEQ_FRAG_MASK			0x000f

Modified: stable/10/sys/net80211/ieee80211_adhoc.c
==============================================================================
--- stable/10/sys/net80211/ieee80211_adhoc.c	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/sys/net80211/ieee80211_adhoc.c	Mon Feb 17 01:36:53 2014	(r262007)
@@ -474,7 +474,7 @@ adhoc_input(struct ieee80211_node *ni, s
 		 * crypto cipher modules used to do delayed update
 		 * of replay sequence numbers.
 		 */
-		if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+		if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 			if ((vap->iv_flags & IEEE80211_F_PRIVACY) == 0) {
 				/*
 				 * Discard encrypted frames when privacy is off.
@@ -492,7 +492,7 @@ adhoc_input(struct ieee80211_node *ni, s
 				goto out;
 			}
 			wh = mtod(m, struct ieee80211_frame *);
-			wh->i_fc[1] &= ~IEEE80211_FC1_WEP;
+			wh->i_fc[1] &= ~IEEE80211_FC1_PROTECTED;
 		} else {
 			/* XXX M_WEP and IEEE80211_F_PRIVACY */
 			key = NULL;
@@ -630,7 +630,7 @@ adhoc_input(struct ieee80211_node *ni, s
 			    ether_sprintf(wh->i_addr2), rssi);
 		}
 #endif
-		if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+		if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, NULL, "%s", "WEP set but not permitted");
 			vap->iv_stats.is_rx_mgtdiscard++; /* XXX */

Modified: stable/10/sys/net80211/ieee80211_hostap.c
==============================================================================
--- stable/10/sys/net80211/ieee80211_hostap.c	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/sys/net80211/ieee80211_hostap.c	Mon Feb 17 01:36:53 2014	(r262007)
@@ -693,7 +693,7 @@ hostap_input(struct ieee80211_node *ni, 
 		 * crypto cipher modules used to do delayed update
 		 * of replay sequence numbers.
 		 */
-		if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+		if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 			if ((vap->iv_flags & IEEE80211_F_PRIVACY) == 0) {
 				/*
 				 * Discard encrypted frames when privacy is off.
@@ -711,7 +711,7 @@ hostap_input(struct ieee80211_node *ni, 
 				goto out;
 			}
 			wh = mtod(m, struct ieee80211_frame *);
-			wh->i_fc[1] &= ~IEEE80211_FC1_WEP;
+			wh->i_fc[1] &= ~IEEE80211_FC1_PROTECTED;
 		} else {
 			/* XXX M_WEP and IEEE80211_F_PRIVACY */
 			key = NULL;
@@ -855,7 +855,7 @@ hostap_input(struct ieee80211_node *ni, 
 			    ether_sprintf(wh->i_addr2), rssi);
 		}
 #endif
-		if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+		if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 			if (subtype != IEEE80211_FC0_SUBTYPE_AUTH) {
 				/*
 				 * Only shared key auth frames with a challenge
@@ -883,7 +883,7 @@ hostap_input(struct ieee80211_node *ni, 
 				goto out;
 			}
 			wh = mtod(m, struct ieee80211_frame *);
-			wh->i_fc[1] &= ~IEEE80211_FC1_WEP;
+			wh->i_fc[1] &= ~IEEE80211_FC1_PROTECTED;
 		}
 		/*
 		 * Pass the packet to radiotap before calling iv_recv_mgmt().

Modified: stable/10/sys/net80211/ieee80211_mesh.c
==============================================================================
--- stable/10/sys/net80211/ieee80211_mesh.c	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/sys/net80211/ieee80211_mesh.c	Mon Feb 17 01:36:53 2014	(r262007)
@@ -1824,7 +1824,7 @@ mesh_input(struct ieee80211_node *ni, st
 			    ether_sprintf(wh->i_addr2), rssi);
 		}
 #endif
-		if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+		if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, NULL, "%s", "WEP set but not permitted");
 			vap->iv_stats.is_rx_mgtdiscard++; /* XXX */

Modified: stable/10/sys/net80211/ieee80211_output.c
==============================================================================
--- stable/10/sys/net80211/ieee80211_output.c	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/sys/net80211/ieee80211_output.c	Mon Feb 17 01:36:53 2014	(r262007)
@@ -771,7 +771,7 @@ ieee80211_mgmt_output(struct ieee80211_n
 	if (params->ibp_flags & IEEE80211_BPF_CRYPTO) {
 		IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_AUTH, wh->i_addr1,
 		    "encrypting frame (%s)", __func__);
-		wh->i_fc[1] |= IEEE80211_FC1_WEP;
+		wh->i_fc[1] |= IEEE80211_FC1_PROTECTED;
 	}
 	m->m_flags |= M_ENCAP;		/* mark encapsulated */
 
@@ -1496,7 +1496,7 @@ ieee80211_encap(struct ieee80211vap *vap
 		     (vap->iv_opmode == IEEE80211_M_STA ?
 		      !IEEE80211_KEY_UNDEFINED(key) :
 		      !IEEE80211_KEY_UNDEFINED(&ni->ni_ucastkey)))) {
-			wh->i_fc[1] |= IEEE80211_FC1_WEP;
+			wh->i_fc[1] |= IEEE80211_FC1_PROTECTED;
 			if (!ieee80211_crypto_enmic(vap, key, m, txfrag)) {
 				IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_OUTPUT,
 				    eh.ether_dhost,

Modified: stable/10/sys/net80211/ieee80211_proto.c
==============================================================================
--- stable/10/sys/net80211/ieee80211_proto.c	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/sys/net80211/ieee80211_proto.c	Mon Feb 17 01:36:53 2014	(r262007)
@@ -447,7 +447,7 @@ ieee80211_dump_pkt(struct ieee80211com *
 		printf(" QoS [TID %u%s]", qwh->i_qos[0] & IEEE80211_QOS_TID,
 			qwh->i_qos[0] & IEEE80211_QOS_ACKPOLICY ? " ACM" : "");
 	}
-	if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+	if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 		int off;
 
 		off = ieee80211_anyhdrspace(ic, wh);

Modified: stable/10/sys/net80211/ieee80211_sta.c
==============================================================================
--- stable/10/sys/net80211/ieee80211_sta.c	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/sys/net80211/ieee80211_sta.c	Mon Feb 17 01:36:53 2014	(r262007)
@@ -728,7 +728,7 @@ sta_input(struct ieee80211_node *ni, str
 		 * crypto cipher modules used to do delayed update
 		 * of replay sequence numbers.
 		 */
-		if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+		if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 			if ((vap->iv_flags & IEEE80211_F_PRIVACY) == 0) {
 				/*
 				 * Discard encrypted frames when privacy is off.
@@ -746,7 +746,7 @@ sta_input(struct ieee80211_node *ni, str
 				goto out;
 			}
 			wh = mtod(m, struct ieee80211_frame *);
-			wh->i_fc[1] &= ~IEEE80211_FC1_WEP;
+			wh->i_fc[1] &= ~IEEE80211_FC1_PROTECTED;
 		} else {
 			/* XXX M_WEP and IEEE80211_F_PRIVACY */
 			key = NULL;
@@ -881,7 +881,7 @@ sta_input(struct ieee80211_node *ni, str
 			    ether_sprintf(wh->i_addr2), rssi);
 		}
 #endif
-		if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+		if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 			if (subtype != IEEE80211_FC0_SUBTYPE_AUTH) {
 				/*
 				 * Only shared key auth frames with a challenge
@@ -910,7 +910,7 @@ sta_input(struct ieee80211_node *ni, str
 				goto out;
 			}
 			wh = mtod(m, struct ieee80211_frame *);
-			wh->i_fc[1] &= ~IEEE80211_FC1_WEP;
+			wh->i_fc[1] &= ~IEEE80211_FC1_PROTECTED;
 		}
 		vap->iv_recv_mgmt(ni, m, subtype, rssi, nf);
 		goto out;

Modified: stable/10/sys/net80211/ieee80211_wds.c
==============================================================================
--- stable/10/sys/net80211/ieee80211_wds.c	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/sys/net80211/ieee80211_wds.c	Mon Feb 17 01:36:53 2014	(r262007)
@@ -556,7 +556,7 @@ wds_input(struct ieee80211_node *ni, str
 		 * crypto cipher modules used to do delayed update
 		 * of replay sequence numbers.
 		 */
-		if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+		if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 			if ((vap->iv_flags & IEEE80211_F_PRIVACY) == 0) {
 				/*
 				 * Discard encrypted frames when privacy is off.
@@ -574,7 +574,7 @@ wds_input(struct ieee80211_node *ni, str
 				goto out;
 			}
 			wh = mtod(m, struct ieee80211_frame *);
-			wh->i_fc[1] &= ~IEEE80211_FC1_WEP;
+			wh->i_fc[1] &= ~IEEE80211_FC1_PROTECTED;
 		} else {
 			/* XXX M_WEP and IEEE80211_F_PRIVACY */
 			key = NULL;
@@ -708,7 +708,7 @@ wds_input(struct ieee80211_node *ni, str
 			    ether_sprintf(wh->i_addr2), rssi);
 		}
 #endif
-		if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+		if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 			    wh, NULL, "%s", "WEP set but not permitted");
 			vap->iv_stats.is_rx_mgtdiscard++; /* XXX */

Modified: stable/10/tools/tools/net80211/stumbler/stumbler.c
==============================================================================
--- stable/10/tools/tools/net80211/stumbler/stumbler.c	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/tools/tools/net80211/stumbler/stumbler.c	Mon Feb 17 01:36:53 2014	(r262007)
@@ -711,7 +711,7 @@ int get_packet_info(struct ieee80211_fra
 	else if (type == IEEE80211_FC0_TYPE_DATA &&
 	    stype == IEEE80211_FC0_SUBTYPE_DATA) {
 	
-		if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+		if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 			unsigned char* iv;
 			
 			node->wep = CRYPT_WEP;

Modified: stable/10/tools/tools/net80211/w00t/ap/ap.c
==============================================================================
--- stable/10/tools/tools/net80211/w00t/ap/ap.c	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/tools/tools/net80211/w00t/ap/ap.c	Mon Feb 17 01:36:53 2014	(r262007)
@@ -509,7 +509,7 @@ void read_real_data(struct params *p, st
 	memcpy(dst, wh->i_addr3, 6);
 
 
-	if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+	if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 		if (!p->wep_len) {
 			printf("Got wep but i aint wep\n");
 			return;
@@ -737,7 +737,7 @@ void read_tap(struct params *p)
 	wh->i_fc[0] |= IEEE80211_FC0_TYPE_DATA;
 	wh->i_fc[1] |= IEEE80211_FC1_DIR_FROMDS;
 	if (p->wep_len)
-		wh->i_fc[1] |= IEEE80211_FC1_WEP;
+		wh->i_fc[1] |= IEEE80211_FC1_PROTECTED;
 
 	/* LLC & SNAP */
 	ptr = (char*) (wh+1);

Modified: stable/10/tools/tools/net80211/w00t/assoc/assoc.c
==============================================================================
--- stable/10/tools/tools/net80211/w00t/assoc/assoc.c	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/tools/tools/net80211/w00t/assoc/assoc.c	Mon Feb 17 01:36:53 2014	(r262007)
@@ -368,7 +368,7 @@ void generic_process(struct ieee80211_fr
 		
 		ptr = (char*) (wh + 1);
 
-		if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+		if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 			if (!p->wep_len) {
 				char srca[3*6];
 				char dsta[3*6];
@@ -676,7 +676,7 @@ void read_tap(struct params *p)
 	wh->i_fc[0] |= IEEE80211_FC0_TYPE_DATA;
 	wh->i_fc[1] |= IEEE80211_FC1_DIR_TODS;
 	if (p->wep_len)
-		wh->i_fc[1] |= IEEE80211_FC1_WEP;
+		wh->i_fc[1] |= IEEE80211_FC1_PROTECTED;
 
 	/* LLC & SNAP */
 	ptr = (char*) (wh+1);

Modified: stable/10/tools/tools/net80211/w00t/expand/expand.c
==============================================================================
--- stable/10/tools/tools/net80211/w00t/expand/expand.c	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/tools/tools/net80211/w00t/expand/expand.c	Mon Feb 17 01:36:53 2014	(r262007)
@@ -99,7 +99,7 @@ int wanted(struct params *p, struct ieee
 	if (memcmp(bssid, p->ap, 6) != 0)
 		return 0;
 
-	if (!(wh->i_fc[1] & IEEE80211_FC1_WEP)) {
+	if (!(wh->i_fc[1] & IEEE80211_FC1_PROTECTED)) {
 		printf("Got non WEP packet...\n");
 		return 0;
 	}
@@ -197,7 +197,7 @@ void send_mcast(struct params *p, unsign
 	wh->i_fc[0] |= IEEE80211_FC0_TYPE_DATA;
 	wh->i_fc[0] |= IEEE80211_FC0_SUBTYPE_DATA;
 	wh->i_fc[1] |= IEEE80211_FC1_DIR_TODS;
-	wh->i_fc[1] |= IEEE80211_FC1_WEP;
+	wh->i_fc[1] |= IEEE80211_FC1_PROTECTED;
 	
 	wh->i_dur[0] = 0x69;
 	

Modified: stable/10/tools/tools/net80211/w00t/prga/prga.c
==============================================================================
--- stable/10/tools/tools/net80211/w00t/prga/prga.c	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/tools/tools/net80211/w00t/prga/prga.c	Mon Feb 17 01:36:53 2014	(r262007)
@@ -190,7 +190,7 @@ void get_prga(struct params *p)
 	if (memcmp(p->ap, bssid, 6) != 0)
 		return;
 
-	if (!(wh->i_fc[1] & IEEE80211_FC1_WEP)) {
+	if (!(wh->i_fc[1] & IEEE80211_FC1_PROTECTED)) {
 		printf("Packet not WEP!\n");
 		return;
 	}
@@ -281,7 +281,7 @@ void send_frag(struct params *p)
 	/* 802.11 */
 	wh->i_fc[0] |= IEEE80211_FC0_TYPE_DATA;
 	wh->i_fc[0] |= IEEE80211_FC0_SUBTYPE_DATA;
-	wh->i_fc[1] |= IEEE80211_FC1_WEP;
+	wh->i_fc[1] |= IEEE80211_FC1_PROTECTED;
 	wh->i_fc[1] |= IEEE80211_FC1_DIR_TODS;
 	if (!last)
 		wh->i_fc[1] |= IEEE80211_FC1_MORE_FRAG;
@@ -527,7 +527,7 @@ void read_tap(struct params *p)
 	wh = (struct ieee80211_frame*) p->packet;
 	wh->i_fc[0] |= IEEE80211_FC0_TYPE_DATA;
 	wh->i_fc[0] |= IEEE80211_FC0_SUBTYPE_DATA;
-	wh->i_fc[1] |= IEEE80211_FC1_WEP;
+	wh->i_fc[1] |= IEEE80211_FC1_PROTECTED;
 	wh->i_fc[1] |= IEEE80211_FC1_DIR_TODS;
 
 	wh->i_dur[0] = 0x69;

Modified: stable/10/tools/tools/net80211/w00t/redir/redir.c
==============================================================================
--- stable/10/tools/tools/net80211/w00t/redir/redir.c	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/tools/tools/net80211/w00t/redir/redir.c	Mon Feb 17 01:36:53 2014	(r262007)
@@ -140,7 +140,7 @@ int wanted(struct params *p, struct ieee
 	if (memcmp(bssid, p->ap, 6) != 0)
 		return 0;
 
-	if (!(wh->i_fc[1] & IEEE80211_FC1_WEP)) {
+	if (!(wh->i_fc[1] & IEEE80211_FC1_PROTECTED)) {
 		printf("Got non WEP packet...\n");
 		return 0;
 	}
@@ -268,7 +268,7 @@ void send_header(struct params *p, struc
 	wh->i_fc[0] |= IEEE80211_FC0_TYPE_DATA;
 	wh->i_fc[0] |= IEEE80211_FC0_SUBTYPE_DATA;
 	wh->i_fc[1] |= IEEE80211_FC1_DIR_TODS;
-	wh->i_fc[1] |= IEEE80211_FC1_WEP;
+	wh->i_fc[1] |= IEEE80211_FC1_PROTECTED;
 	wh->i_fc[1] |= IEEE80211_FC1_MORE_FRAG;
 
 	wh->i_dur[0] = 0x69;
@@ -345,7 +345,7 @@ void send_data(struct params *p)
 	wh->i_fc[0] |= IEEE80211_FC0_TYPE_DATA;
 	wh->i_fc[0] |= IEEE80211_FC0_SUBTYPE_DATA;
 	wh->i_fc[1] |= IEEE80211_FC1_DIR_TODS;
-	wh->i_fc[1] |= IEEE80211_FC1_WEP;
+	wh->i_fc[1] |= IEEE80211_FC1_PROTECTED;
 	
 	wh->i_dur[0] = 0x69;
 	

Modified: stable/10/tools/tools/net80211/wesside/wesside/wesside.c
==============================================================================
--- stable/10/tools/tools/net80211/wesside/wesside/wesside.c	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/tools/tools/net80211/wesside/wesside/wesside.c	Mon Feb 17 01:36:53 2014	(r262007)
@@ -1093,13 +1093,13 @@ void stuff_for_us(struct ieee80211_frame
 		int dlen;
 		dlen = len - sizeof(*wh) - 4 -4;
 
-		if (!( wh->i_fc[1] & IEEE80211_FC1_WEP)) {
+		if (!( wh->i_fc[1] & IEEE80211_FC1_PROTECTED)) {
 			time_print("WARNING: Got NON wep packet from %s dlen %d stype=%x\n",
 				   mac2str(wh->i_addr2), dlen, stype);
 				   return;
 		}
 
-		assert (wh->i_fc[1] & IEEE80211_FC1_WEP);
+		assert (wh->i_fc[1] & IEEE80211_FC1_PROTECTED);
 
 		if ((dlen == 36 || dlen == PADDED_ARPLEN) && rtrmac == (unsigned char*) 1) {
 			rtrmac = (unsigned char *) malloc(6);
@@ -1577,7 +1577,8 @@ void stuff_for_net(struct ieee80211_fram
 		}
 
 		// wep data!
-		if ( (wh->i_fc[1] & IEEE80211_FC1_WEP) && dlen > (4+8+4)) {
+		if ( (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) &&
+		    dlen > (4+8+4)) {
 			got_wep(wh, rd);
 		}
 	}
@@ -1768,7 +1769,7 @@ void prepare_fragstate(struct frag_state
 	fs->wh.i_fc[0] |= IEEE80211_FC0_TYPE_DATA;
 	fs->wh.i_fc[1] |= IEEE80211_FC1_DIR_TODS |
 				IEEE80211_FC1_MORE_FRAG |
-				IEEE80211_FC1_WEP;
+				IEEE80211_FC1_PROTECTED;
 
 	memset(&fs->data[8+8+20], 0, pad);
 }
@@ -1858,7 +1859,7 @@ void flood_inet(tx) {
 		fill_basic(wh);
 
 		wh->i_fc[0] |= IEEE80211_FC0_TYPE_DATA;
-		wh->i_fc[1] |= IEEE80211_FC1_WEP | IEEE80211_FC1_DIR_TODS;
+		wh->i_fc[1] |= IEEE80211_FC1_PROTECTED | IEEE80211_FC1_DIR_TODS;
 		memset(wh->i_addr3, 0xff, 6);
 
 		body = (unsigned char*) wh + sizeof(*wh);
@@ -1880,7 +1881,7 @@ void flood_inet(tx) {
 		fill_basic(wh);
 		
 		wh->i_fc[0] |= IEEE80211_FC0_TYPE_DATA;
-		wh->i_fc[1] |= IEEE80211_FC1_WEP | IEEE80211_FC1_DIR_TODS;
+		wh->i_fc[1] |= IEEE80211_FC1_PROTECTED | IEEE80211_FC1_DIR_TODS;
 		memcpy(wh->i_addr3, rtrmac, 6);
 
 		body = (unsigned char*) wh + sizeof(*wh);
@@ -1975,7 +1976,7 @@ void send_arp(int tx, unsigned short op,
 	fill_basic(wh);
 
 	wh->i_fc[0] |= IEEE80211_FC0_TYPE_DATA;
-	wh->i_fc[1] |= IEEE80211_FC1_WEP | IEEE80211_FC1_DIR_TODS;
+	wh->i_fc[1] |= IEEE80211_FC1_PROTECTED | IEEE80211_FC1_DIR_TODS;
 	memset(wh->i_addr3, 0xff, 6);
 
 	body = (unsigned char*) wh + sizeof(*wh);
@@ -2254,7 +2255,7 @@ void read_tap() {
 	fill_basic(wh);
 
         wh->i_fc[0] |= IEEE80211_FC0_TYPE_DATA;
-        wh->i_fc[1] |= IEEE80211_FC1_WEP | IEEE80211_FC1_DIR_TODS;
+        wh->i_fc[1] |= IEEE80211_FC1_PROTECTED | IEEE80211_FC1_DIR_TODS;
 
 	memcpy(wh->i_addr2, eh->ether_shost, 6);
 	memcpy(wh->i_addr3, eh->ether_dhost, 6);

Modified: stable/10/tools/tools/net80211/wlaninject/wlaninject.c
==============================================================================
--- stable/10/tools/tools/net80211/wlaninject/wlaninject.c	Mon Feb 17 00:00:39 2014	(r262006)
+++ stable/10/tools/tools/net80211/wlaninject/wlaninject.c	Mon Feb 17 01:36:53 2014	(r262007)
@@ -600,7 +600,7 @@ int main(int argc, char *argv[])
 			break;
 
 		case 'w':
-			wh->i_fc[1] |= IEEE80211_FC1_WEP;
+			wh->i_fc[1] |= IEEE80211_FC1_PROTECTED;
 			break;
 
 		case 'o':