diff options
| author | kevlo <kevlo@FreeBSD.org> | 2014-02-17 01:36:53 +0000 |
|---|---|---|
| committer | kevlo <kevlo@FreeBSD.org> | 2014-02-17 01:36:53 +0000 |
| commit | ecbaab7887ad759827a12115b1111cfa50a6f092 (patch) | |
| tree | 1919e764c93c5049f1d8a0091180676c061a19d8 /sys/dev/ipw | |
| parent | 4bb58e4f5d8dbf6ff38d1652c421414f9dae8cf4 (diff) | |
| download | FreeBSD-src-ecbaab7887ad759827a12115b1111cfa50a6f092.zip FreeBSD-src-ecbaab7887ad759827a12115b1111cfa50a6f092.tar.gz | |
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
Diffstat (limited to 'sys/dev/ipw')
| -rw-r--r-- | sys/dev/ipw/if_ipw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/ipw/if_ipw.c b/sys/dev/ipw/if_ipw.c index 28fa0fd..7832d87 100644 --- a/sys/dev/ipw/if_ipw.c +++ b/sys/dev/ipw/if_ipw.c @@ -1604,7 +1604,7 @@ ipw_tx_start(struct ifnet *ifp, struct mbuf *m0, struct ieee80211_node *ni) 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 mbuf *m0, struct ieee80211_node *ni) 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; |
