diff options
author | bschmidt <bschmidt@FreeBSD.org> | 2010-12-18 19:56:45 +0000 |
---|---|---|
committer | bschmidt <bschmidt@FreeBSD.org> | 2010-12-18 19:56:45 +0000 |
commit | 78283324364b1456aa739836872b98e279f31e5d (patch) | |
tree | c3ce5bebbd5c0f56bbbcb1d6431e4a3b2aec50d8 /usr.sbin/wpa | |
parent | bb1eb85dcb8a8314526b37f476d399fc671ca6c7 (diff) | |
download | FreeBSD-src-78283324364b1456aa739836872b98e279f31e5d.zip FreeBSD-src-78283324364b1456aa739836872b98e279f31e5d.tar.gz |
Change bsd_del_key() to match upstream code:
- change order of if/else
- move wpa_printf() into the condition
- change unsigned char* to u8*
- prefer os_memset/os_memcpy
Diffstat (limited to 'usr.sbin/wpa')
-rw-r--r-- | usr.sbin/wpa/hostapd/driver_freebsd.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/usr.sbin/wpa/hostapd/driver_freebsd.c b/usr.sbin/wpa/hostapd/driver_freebsd.c index b64a3d1..0979e3f 100644 --- a/usr.sbin/wpa/hostapd/driver_freebsd.c +++ b/usr.sbin/wpa/hostapd/driver_freebsd.c @@ -246,21 +246,19 @@ bsd_sta_set_flags(void *priv, const u8 *addr, int total_flags, } static int -bsd_del_key(void *priv, const unsigned char *addr, int key_idx) +bsd_del_key(void *priv, const u8 *addr, int key_idx) { - struct bsd_driver_data *drv = priv; - struct hostapd_data *hapd = drv->hapd; struct ieee80211req_del_key wk; - wpa_printf(MSG_DEBUG, "%s: addr=%s key_idx=%d\n", - __func__, ether_sprintf(addr), key_idx); - - memset(&wk, 0, sizeof(wk)); - if (addr != NULL) { - memcpy(wk.idk_macaddr, addr, IEEE80211_ADDR_LEN); - wk.idk_keyix = (u_int8_t) IEEE80211_KEYIX_NONE; /* XXX */ - } else { + os_memset(&wk, 0, sizeof(wk)); + if (addr == NULL) { + wpa_printf(MSG_DEBUG, "%s: key_idx=%d", __func__, key_idx); wk.idk_keyix = key_idx; + } else { + wpa_printf(MSG_DEBUG, "%s: addr=" MACSTR, __func__, + MAC2STR(addr)); + os_memcpy(wk.idk_macaddr, addr, IEEE80211_ADDR_LEN); + wk.idk_keyix = (u_int8_t) IEEE80211_KEYIX_NONE; /* XXX */ } return set80211var(priv, IEEE80211_IOC_DELKEY, &wk, sizeof(wk)); |