diff options
| author | sam <sam@FreeBSD.org> | 2008-03-24 21:08:25 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2008-03-24 21:08:25 +0000 |
| commit | 8e449bffe3af56fe8cfa5bac6cf6a4171bcb20eb (patch) | |
| tree | 5c9b3ca5761e9736e2f8e2871bdd9b087549d59d /contrib/hostapd/ieee802_1x.c | |
| parent | 9c6231a7376ca18ee605d9bd2f0e357b3bf0069e (diff) | |
| download | FreeBSD-src-8e449bffe3af56fe8cfa5bac6cf6a4171bcb20eb.zip FreeBSD-src-8e449bffe3af56fe8cfa5bac6cf6a4171bcb20eb.tar.gz | |
resolve merge conflicts
MFC after: 3 weeks
Diffstat (limited to 'contrib/hostapd/ieee802_1x.c')
| -rw-r--r-- | contrib/hostapd/ieee802_1x.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/hostapd/ieee802_1x.c b/contrib/hostapd/ieee802_1x.c index 7cde0652..53f6b47 100644 --- a/contrib/hostapd/ieee802_1x.c +++ b/contrib/hostapd/ieee802_1x.c @@ -1678,6 +1678,8 @@ int ieee802_1x_init(struct hostapd_data *hapd) void ieee802_1x_deinit(struct hostapd_data *hapd) { + eloop_cancel_timeout(ieee802_1x_rekey, hapd, NULL); + if (hapd->driver != NULL && (hapd->conf->ieee802_1x || hapd->conf->wpa)) hostapd_set_ieee8021x(hapd->conf->iface, hapd, 0); |
