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/net80211/ieee80211_adhoc.c | |
| 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/net80211/ieee80211_adhoc.c')
| -rw-r--r-- | sys/net80211/ieee80211_adhoc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/net80211/ieee80211_adhoc.c b/sys/net80211/ieee80211_adhoc.c index ecf3a87..e9e0d30 100644 --- a/sys/net80211/ieee80211_adhoc.c +++ b/sys/net80211/ieee80211_adhoc.c @@ -474,7 +474,7 @@ adhoc_input(struct ieee80211_node *ni, struct mbuf *m, int rssi, int nf) * 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, struct mbuf *m, int rssi, int nf) 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, struct mbuf *m, int rssi, int nf) 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 */ |
