Author: kevlo
Date: Wed Jan  8 08:06:56 2014
New Revision: 260444
URL: http://svnweb.freebsd.org/changeset/base/260444

Log:
  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:
  head/contrib/libpcap/ieee80211.h
  head/share/man/man9/ieee80211_crypto.9
  head/sys/dev/ath/if_ath_tx.c
  head/sys/dev/bwi/if_bwi.c
  head/sys/dev/bwn/if_bwn.c
  head/sys/dev/ipw/if_ipw.c
  head/sys/dev/iwi/if_iwi.c
  head/sys/dev/iwn/if_iwn.c
  head/sys/dev/malo/if_malo.c
  head/sys/dev/mwl/if_mwl.c
  head/sys/dev/ral/rt2560.c
  head/sys/dev/ral/rt2661.c
  head/sys/dev/ral/rt2860.c
  head/sys/dev/usb/wlan/if_rsu.c
  head/sys/dev/usb/wlan/if_rum.c
  head/sys/dev/usb/wlan/if_run.c
  head/sys/dev/usb/wlan/if_uath.c
  head/sys/dev/usb/wlan/if_upgt.c
  head/sys/dev/usb/wlan/if_ural.c
  head/sys/dev/usb/wlan/if_urtw.c
  head/sys/dev/usb/wlan/if_urtwn.c
  head/sys/dev/usb/wlan/if_zyd.c
  head/sys/dev/wi/if_wi.c
  head/sys/dev/wpi/if_wpi.c
  head/sys/net80211/ieee80211.h
  head/sys/net80211/ieee80211_adhoc.c
  head/sys/net80211/ieee80211_hostap.c
  head/sys/net80211/ieee80211_mesh.c
  head/sys/net80211/ieee80211_output.c
  head/sys/net80211/ieee80211_proto.c
  head/sys/net80211/ieee80211_sta.c
  head/sys/net80211/ieee80211_wds.c
  head/tools/tools/net80211/stumbler/stumbler.c
  head/tools/tools/net80211/w00t/ap/ap.c
  head/tools/tools/net80211/w00t/assoc/assoc.c
  head/tools/tools/net80211/w00t/expand/expand.c
  head/tools/tools/net80211/w00t/prga/prga.c
  head/tools/tools/net80211/w00t/redir/redir.c
  head/tools/tools/net80211/wesside/wesside/wesside.c
  head/tools/tools/net80211/wlaninject/wlaninject.c

Modified: head/contrib/libpcap/ieee80211.h
==============================================================================
--- head/contrib/libpcap/ieee80211.h    Wed Jan  8 08:03:48 2014        
(r260443)
+++ head/contrib/libpcap/ieee80211.h    Wed Jan  8 08:06:56 2014        
(r260444)
@@ -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: head/share/man/man9/ieee80211_crypto.9
==============================================================================
--- head/share/man/man9/ieee80211_crypto.9      Wed Jan  8 08:03:48 2014        
(r260443)
+++ head/share/man/man9/ieee80211_crypto.9      Wed Jan  8 08:06:56 2014        
(r260444)
@@ -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: head/sys/dev/ath/if_ath_tx.c
==============================================================================
--- head/sys/dev/ath/if_ath_tx.c        Wed Jan  8 08:03:48 2014        
(r260443)
+++ head/sys/dev/ath/if_ath_tx.c        Wed Jan  8 08:06:56 2014        
(r260444)
@@ -1586,7 +1586,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);
@@ -2216,7 +2216,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: head/sys/dev/bwi/if_bwi.c
==============================================================================
--- head/sys/dev/bwi/if_bwi.c   Wed Jan  8 08:03:48 2014        (r260443)
+++ head/sys/dev/bwi/if_bwi.c   Wed Jan  8 08:06:56 2014        (r260444)
@@ -1396,7 +1396,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);
@@ -3001,7 +3001,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) &&
@@ -3184,7 +3184,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;
@@ -3820,7 +3820,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: head/sys/dev/bwn/if_bwn.c
==============================================================================
--- head/sys/dev/bwn/if_bwn.c   Wed Jan  8 08:03:48 2014        (r260443)
+++ head/sys/dev/bwn/if_bwn.c   Wed Jan  8 08:06:56 2014        (r260444)
@@ -1317,7 +1317,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);
@@ -9781,7 +9781,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 ||
@@ -10320,7 +10320,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: head/sys/dev/ipw/if_ipw.c
==============================================================================
--- head/sys/dev/ipw/if_ipw.c   Wed Jan  8 08:03:48 2014        (r260443)
+++ head/sys/dev/ipw/if_ipw.c   Wed Jan  8 08:06:56 2014        (r260444)
@@ -1597,7 +1597,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);
@@ -1621,7 +1621,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: head/sys/dev/iwi/if_iwi.c
==============================================================================
--- head/sys/dev/iwi/if_iwi.c   Wed Jan  8 08:03:48 2014        (r260443)
+++ head/sys/dev/iwi/if_iwi.c   Wed Jan  8 08:06:56 2014        (r260444)
@@ -1846,7 +1846,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: head/sys/dev/iwn/if_iwn.c
==============================================================================
--- head/sys/dev/iwn/if_iwn.c   Wed Jan  8 08:03:48 2014        (r260443)
+++ head/sys/dev/iwn/if_iwn.c   Wed Jan  8 08:06:56 2014        (r260444)
@@ -4137,7 +4137,7 @@ iwn_tx_data(struct iwn_softc *sc, struct
        }
 
        /* 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: head/sys/dev/malo/if_malo.c
==============================================================================
--- head/sys/dev/malo/if_malo.c Wed Jan  8 08:03:48 2014        (r260443)
+++ head/sys/dev/malo/if_malo.c Wed Jan  8 08:06:56 2014        (r260444)
@@ -1102,7 +1102,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: head/sys/dev/mwl/if_mwl.c
==============================================================================
--- head/sys/dev/mwl/if_mwl.c   Wed Jan  8 08:03:48 2014        (r260443)
+++ head/sys/dev/mwl/if_mwl.c   Wed Jan  8 08:06:56 2014        (r260444)
@@ -2886,12 +2886,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)) {
@@ -3205,7 +3206,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: head/sys/dev/ral/rt2560.c
==============================================================================
--- head/sys/dev/ral/rt2560.c   Wed Jan  8 08:03:48 2014        (r260443)
+++ head/sys/dev/ral/rt2560.c   Wed Jan  8 08:06:56 2014        (r260444)
@@ -1558,7 +1558,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);
@@ -1804,7 +1804,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: head/sys/dev/ral/rt2661.c
==============================================================================
--- head/sys/dev/ral/rt2661.c   Wed Jan  8 08:03:48 2014        (r260443)
+++ head/sys/dev/ral/rt2661.c   Wed Jan  8 08:06:56 2014        (r260444)
@@ -1319,7 +1319,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);
@@ -1494,7 +1494,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: head/sys/dev/ral/rt2860.c
==============================================================================
--- head/sys/dev/ral/rt2860.c   Wed Jan  8 08:03:48 2014        (r260443)
+++ head/sys/dev/ral/rt2860.c   Wed Jan  8 08:06:56 2014        (r260444)
@@ -1285,9 +1285,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
 
@@ -1493,7 +1493,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: head/sys/dev/usb/wlan/if_rsu.c
==============================================================================
--- head/sys/dev/usb/wlan/if_rsu.c      Wed Jan  8 08:03:48 2014        
(r260443)
+++ head/sys/dev/usb/wlan/if_rsu.c      Wed Jan  8 08:06:56 2014        
(r260444)
@@ -1670,7 +1670,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: head/sys/dev/usb/wlan/if_rum.c
==============================================================================
--- head/sys/dev/usb/wlan/if_rum.c      Wed Jan  8 08:03:48 2014        
(r260443)
+++ head/sys/dev/usb/wlan/if_rum.c      Wed Jan  8 08:06:56 2014        
(r260444)
@@ -1121,7 +1121,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);
@@ -1239,7 +1239,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: head/sys/dev/usb/wlan/if_run.c
==============================================================================
--- head/sys/dev/usb/wlan/if_run.c      Wed Jan  8 08:03:48 2014        
(r260443)
+++ head/sys/dev/usb/wlan/if_run.c      Wed Jan  8 08:06:56 2014        
(r260444)
@@ -2807,8 +2807,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: head/sys/dev/usb/wlan/if_uath.c
==============================================================================
--- head/sys/dev/usb/wlan/if_uath.c     Wed Jan  8 08:03:48 2014        
(r260443)
+++ head/sys/dev/usb/wlan/if_uath.c     Wed Jan  8 08:06:56 2014        
(r260444)
@@ -1626,7 +1626,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: head/sys/dev/usb/wlan/if_upgt.c
==============================================================================
--- head/sys/dev/usb/wlan/if_upgt.c     Wed Jan  8 08:03:48 2014        
(r260443)
+++ head/sys/dev/usb/wlan/if_upgt.c     Wed Jan  8 08:06:56 2014        
(r260444)
@@ -2223,7 +2223,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: head/sys/dev/usb/wlan/if_ural.c
==============================================================================
--- head/sys/dev/usb/wlan/if_ural.c     Wed Jan  8 08:03:48 2014        
(r260443)
+++ head/sys/dev/usb/wlan/if_ural.c     Wed Jan  8 08:06:56 2014        
(r260444)
@@ -1120,7 +1120,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);
@@ -1289,7 +1289,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: head/sys/dev/usb/wlan/if_urtw.c
==============================================================================
--- head/sys/dev/usb/wlan/if_urtw.c     Wed Jan  8 08:03:48 2014        
(r260443)
+++ head/sys/dev/usb/wlan/if_urtw.c     Wed Jan  8 08:06:56 2014        
(r260444)
@@ -1697,7 +1697,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: head/sys/dev/usb/wlan/if_urtwn.c
==============================================================================
--- head/sys/dev/usb/wlan/if_urtwn.c    Wed Jan  8 08:03:48 2014        
(r260443)
+++ head/sys/dev/usb/wlan/if_urtwn.c    Wed Jan  8 08:06:56 2014        
(r260444)
@@ -1600,7 +1600,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: head/sys/dev/usb/wlan/if_zyd.c
==============================================================================
--- head/sys/dev/usb/wlan/if_zyd.c      Wed Jan  8 08:03:48 2014        
(r260443)
+++ head/sys/dev/usb/wlan/if_zyd.c      Wed Jan  8 08:06:56 2014        
(r260444)
@@ -2507,7 +2507,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: head/sys/dev/wi/if_wi.c
==============================================================================
--- head/sys/dev/wi/if_wi.c     Wed Jan  8 08:03:48 2014        (r260443)
+++ head/sys/dev/wi/if_wi.c     Wed Jan  8 08:06:56 2014        (r260444)
@@ -1004,7 +1004,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);
@@ -1107,7 +1107,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: head/sys/dev/wpi/if_wpi.c
==============================================================================
--- head/sys/dev/wpi/if_wpi.c   Wed Jan  8 08:03:48 2014        (r260443)
+++ head/sys/dev/wpi/if_wpi.c   Wed Jan  8 08:06:56 2014        (r260444)
@@ -1882,7 +1882,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);
@@ -1951,7 +1951,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: head/sys/net80211/ieee80211.h
==============================================================================
--- head/sys/net80211/ieee80211.h       Wed Jan  8 08:03:48 2014        
(r260443)
+++ head/sys/net80211/ieee80211.h       Wed Jan  8 08:06:56 2014        
(r260444)
@@ -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: head/sys/net80211/ieee80211_adhoc.c
==============================================================================
--- head/sys/net80211/ieee80211_adhoc.c Wed Jan  8 08:03:48 2014        
(r260443)
+++ head/sys/net80211/ieee80211_adhoc.c Wed Jan  8 08:06:56 2014        
(r260444)
@@ -475,7 +475,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.
@@ -493,7 +493,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;
@@ -631,7 +631,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: head/sys/net80211/ieee80211_hostap.c
==============================================================================
--- head/sys/net80211/ieee80211_hostap.c        Wed Jan  8 08:03:48 2014        
(r260443)
+++ head/sys/net80211/ieee80211_hostap.c        Wed Jan  8 08:06:56 2014        
(r260444)
@@ -694,7 +694,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.
@@ -712,7 +712,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;
@@ -856,7 +856,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
@@ -884,7 +884,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: head/sys/net80211/ieee80211_mesh.c
==============================================================================
--- head/sys/net80211/ieee80211_mesh.c  Wed Jan  8 08:03:48 2014        
(r260443)
+++ head/sys/net80211/ieee80211_mesh.c  Wed Jan  8 08:06:56 2014        
(r260444)
@@ -1825,7 +1825,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: head/sys/net80211/ieee80211_output.c
==============================================================================
--- head/sys/net80211/ieee80211_output.c        Wed Jan  8 08:03:48 2014        
(r260443)
+++ head/sys/net80211/ieee80211_output.c        Wed Jan  8 08:06:56 2014        
(r260444)
@@ -772,7 +772,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 */
 
@@ -1497,7 +1497,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: head/sys/net80211/ieee80211_proto.c
==============================================================================
--- head/sys/net80211/ieee80211_proto.c Wed Jan  8 08:03:48 2014        
(r260443)
+++ head/sys/net80211/ieee80211_proto.c Wed Jan  8 08:06:56 2014        
(r260444)
@@ -448,7 +448,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: head/sys/net80211/ieee80211_sta.c
==============================================================================
--- head/sys/net80211/ieee80211_sta.c   Wed Jan  8 08:03:48 2014        
(r260443)
+++ head/sys/net80211/ieee80211_sta.c   Wed Jan  8 08:06:56 2014        
(r260444)
@@ -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: head/sys/net80211/ieee80211_wds.c
==============================================================================
--- head/sys/net80211/ieee80211_wds.c   Wed Jan  8 08:03:48 2014        
(r260443)
+++ head/sys/net80211/ieee80211_wds.c   Wed Jan  8 08:06:56 2014        
(r260444)
@@ -557,7 +557,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.
@@ -575,7 +575,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;
@@ -709,7 +709,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: head/tools/tools/net80211/stumbler/stumbler.c
==============================================================================
--- head/tools/tools/net80211/stumbler/stumbler.c       Wed Jan  8 08:03:48 
2014        (r260443)
+++ head/tools/tools/net80211/stumbler/stumbler.c       Wed Jan  8 08:06:56 
2014        (r260444)
@@ -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: head/tools/tools/net80211/w00t/ap/ap.c
==============================================================================
--- head/tools/tools/net80211/w00t/ap/ap.c      Wed Jan  8 08:03:48 2014        
(r260443)
+++ head/tools/tools/net80211/w00t/ap/ap.c      Wed Jan  8 08:06:56 2014        
(r260444)
@@ -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: head/tools/tools/net80211/w00t/assoc/assoc.c
==============================================================================
--- head/tools/tools/net80211/w00t/assoc/assoc.c        Wed Jan  8 08:03:48 
2014        (r260443)
+++ head/tools/tools/net80211/w00t/assoc/assoc.c        Wed Jan  8 08:06:56 
2014        (r260444)
@@ -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: head/tools/tools/net80211/w00t/expand/expand.c
==============================================================================
--- head/tools/tools/net80211/w00t/expand/expand.c      Wed Jan  8 08:03:48 
2014        (r260443)
+++ head/tools/tools/net80211/w00t/expand/expand.c      Wed Jan  8 08:06:56 
2014        (r260444)
@@ -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: head/tools/tools/net80211/w00t/prga/prga.c
==============================================================================
--- head/tools/tools/net80211/w00t/prga/prga.c  Wed Jan  8 08:03:48 2014        
(r260443)
+++ head/tools/tools/net80211/w00t/prga/prga.c  Wed Jan  8 08:06:56 2014        
(r260444)
@@ -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: head/tools/tools/net80211/w00t/redir/redir.c
==============================================================================
--- head/tools/tools/net80211/w00t/redir/redir.c        Wed Jan  8 08:03:48 
2014        (r260443)
+++ head/tools/tools/net80211/w00t/redir/redir.c        Wed Jan  8 08:06:56 
2014        (r260444)
@@ -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: head/tools/tools/net80211/wesside/wesside/wesside.c
==============================================================================
--- head/tools/tools/net80211/wesside/wesside/wesside.c Wed Jan  8 08:03:48 
2014        (r260443)
+++ head/tools/tools/net80211/wesside/wesside/wesside.c Wed Jan  8 08:06:56 
2014        (r260444)
@@ -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: head/tools/tools/net80211/wlaninject/wlaninject.c
==============================================================================
--- head/tools/tools/net80211/wlaninject/wlaninject.c   Wed Jan  8 08:03:48 
2014        (r260443)
+++ head/tools/tools/net80211/wlaninject/wlaninject.c   Wed Jan  8 08:06:56 
2014        (r260444)
@@ -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':
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to