Amazing-Mirror/fragattacks
1
0
Fork 0
mirror of https://github.com/vanhoefm/fragattacks.git synced 2024-11-28 18:28:23 -05:00
Code Issues Projects Releases Wiki Activity

bsd: Fix compilation error for NetBSD

Browse Source 
Commit 5dd82c634c causes compilation error
on NetBSD 6.1.2. Fix compilation with #ifdef blocks.

Signed-hostap: Masashi Honma <masashi.honma@gmail.com>
This commit is contained in:
Masashi Honma 2013-11-26 11:43:37 +09:00 committed by Jouni Malinen
parent 667a158d08
commit e706d2d30d
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/drivers/driver_bsd.c
View File

@ -85,8 +85,10 @@ get80211opmode(struct bsd_driver_data *drv)
return IEEE80211_M_HOSTAP; return IEEE80211_M_HOSTAP;
if (ifmr.ifm_current & IFM_IEEE80211_MONITOR) if (ifmr.ifm_current & IFM_IEEE80211_MONITOR)
return IEEE80211_M_MONITOR; return IEEE80211_M_MONITOR;
#ifdef IEEE80211_M_MBSS
if (ifmr.ifm_current & IFM_IEEE80211_MBSS) if (ifmr.ifm_current & IFM_IEEE80211_MBSS)
return IEEE80211_M_MBSS; return IEEE80211_M_MBSS;
#endif /* IEEE80211_M_MBSS */
} }
return IEEE80211_M_STA; return IEEE80211_M_STA;
} }
@ -324,7 +326,9 @@ bsd_set_key(const char *ifname, void *priv, enum wpa_alg alg,
size_t seq_len, const u8 *key, size_t key_len) size_t seq_len, const u8 *key, size_t key_len)
{ {
struct ieee80211req_key wk; struct ieee80211req_key wk;
#ifdef IEEE80211_KEY_NOREPLAY
struct bsd_driver_data *drv = priv; struct bsd_driver_data *drv = priv;
#endif /* IEEE80211_KEY_NOREPLAY */
wpa_printf(MSG_DEBUG, "%s: alg=%d addr=%p key_idx=%d set_tx=%d " wpa_printf(MSG_DEBUG, "%s: alg=%d addr=%p key_idx=%d set_tx=%d "
"seq_len=%zu key_len=%zu", __func__, alg, addr, key_idx, "seq_len=%zu key_len=%zu", __func__, alg, addr, key_idx,
@ -380,12 +384,14 @@ bsd_set_key(const char *ifname, void *priv, enum wpa_alg alg,
if (wk.ik_keyix != IEEE80211_KEYIX_NONE && set_tx) if (wk.ik_keyix != IEEE80211_KEYIX_NONE && set_tx)
wk.ik_flags |= IEEE80211_KEY_DEFAULT; wk.ik_flags |= IEEE80211_KEY_DEFAULT;
#ifndef HOSTAPD #ifndef HOSTAPD
#ifdef IEEE80211_KEY_NOREPLAY
/* /*
* Ignore replay failures in IBSS and AHDEMO mode. * Ignore replay failures in IBSS and AHDEMO mode.
*/ */
if (drv->opmode == IEEE80211_M_IBSS || if (drv->opmode == IEEE80211_M_IBSS ||
drv->opmode == IEEE80211_M_AHDEMO) drv->opmode == IEEE80211_M_AHDEMO)
wk.ik_flags |= IEEE80211_KEY_NOREPLAY; wk.ik_flags |= IEEE80211_KEY_NOREPLAY;
#endif /* IEEE80211_KEY_NOREPLAY */
#endif /* HOSTAPD */ #endif /* HOSTAPD */
wk.ik_keylen = key_len; wk.ik_keylen = key_len;
if (seq) { if (seq) {