jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 14:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

hostapd: bump to version 2.2

Browse Source 
Drop upstream patch.
CONFIG_IEEE80211W is now enabled by default.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Baruch Siach 2014-06-05 17:24:18 +03:00 committed by Peter Korsgaard
parent ad92b26df7
commit b912fff550
2 changed files with 1 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
package/hostapd/hostapd-0001-Fix-Beacon-RX-before-AP-setup-completion.patch
View File

@ -1,35 +0,0 @@
From 334ec001bbd31c5bc83d6593e58dfbbf6b8785a2 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j@w1.fi>
Date: Thu, 6 Feb 2014 15:22:06 +0200
Subject: [PATCH] Fix Beacon RX before AP setup completion
It is possible for the driver to report Beacon RX prior to hostapd
having completed AP mode setup, e.g., when changing country code. Beacon
frame processing for OLBC was not prepared for this and could trigger
segfault due to NULL pointer dereference. Fix this by ignoring the
Beacon frames received prior to completing interface setup when
determining OLBC updates.
Signed-hostap: Jouni Malinen <j@w1.fi>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
src/ap/ap_list.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/ap/ap_list.c b/src/ap/ap_list.c
index f9b1540..287d520 100644
--- a/src/ap/ap_list.c
+++ b/src/ap/ap_list.c
@@ -32,7 +32,8 @@ static int ap_list_beacon_olbc(struct hostapd_iface *iface, struct ap_info *ap)
{
int i;
- if (iface->current_mode->mode != HOSTAPD_MODE_IEEE80211G ||
+ if (iface->current_mode == NULL ||
+ iface->current_mode->mode != HOSTAPD_MODE_IEEE80211G ||
iface->conf->channel != ap->channel)
return 0;
--
2.0.0.rc2

3
package/hostapd/hostapd.mk
View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
HOSTAPD_VERSION = 2.1 HOSTAPD_VERSION = 2.2
HOSTAPD_SITE = http://hostap.epitest.fi/releases HOSTAPD_SITE = http://hostap.epitest.fi/releases
HOSTAPD_SUBDIR = hostapd HOSTAPD_SUBDIR = hostapd
HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config
@ -21,7 +21,6 @@ HOSTAPD_CONFIG_ENABLE = \
CONFIG_IEEE80211AC \ CONFIG_IEEE80211AC \
CONFIG_IEEE80211N \ CONFIG_IEEE80211N \
CONFIG_IEEE80211R \ CONFIG_IEEE80211R \
CONFIG_IEEE80211W \
CONFIG_INTERNAL_LIBTOMMATH \ CONFIG_INTERNAL_LIBTOMMATH \
CONFIG_INTERWORKING \ CONFIG_INTERWORKING \
CONFIG_LIBNL32 \ CONFIG_LIBNL32 \