jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Move wpa_scan_results_free() into shared C file

Browse source 
Replace the inline helper function with a new C file that can be used
for common driver API related function.

Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2011-11-13 18:56:26 +02:00
parent a4cef16279
commit aea855d752
10 changed files with 53 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hostapd/Android.mk
View file

@ -766,6 +766,8 @@ L_CFLAGS += -DCONFIG_P2P_MANAGER
OBJS += src/ap/p2p_hostapd.c
endif
OBJS += src/drivers/driver_common.c
ifdef CONFIG_NO_STDOUT_DEBUG
L_CFLAGS += -DCONFIG_NO_STDOUT_DEBUG
endif

2
hostapd/Makefile
View file

@ -749,6 +749,8 @@ ifdef CONFIG_INTERWORKING
CFLAGS += -DCONFIG_INTERWORKING
endif
OBJS += ../src/drivers/driver_common.o
ifdef CONFIG_WPA_CLI_EDIT
OBJS_c += ../src/utils/edit.o
else

14
src/drivers/driver.h
View file

@ -3492,17 +3492,7 @@ static inline void drv_event_eapol_rx(void *ctx, const u8 *src, const u8 *data,
wpa_supplicant_event(ctx, EVENT_EAPOL_RX, &event);
}
static inline void wpa_scan_results_free(struct wpa_scan_results *res)
{
size_t i;
if (res == NULL)
return;
for (i = 0; i < res->num; i++)
os_free(res->res[i]);
os_free(res->res);
os_free(res);
}
/* driver_common.c */
void wpa_scan_results_free(struct wpa_scan_results *res);
#endif /* DRIVER_H */

30
src/drivers/driver_common.c Normal file
View file

@ -0,0 +1,30 @@
/*
* Common driver-related functions
* Copyright (c) 2003-2011, Jouni Malinen <j@w1.fi>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
* Alternatively, this software may be distributed under the terms of BSD
* license.
*
* See README and COPYING for more details.
*/
#include "includes.h"
#include "utils/common.h"
#include "driver.h"
void wpa_scan_results_free(struct wpa_scan_results *res)
{
size_t i;
if (res == NULL)
return;
for (i = 0; i < res->num; i++)
os_free(res->res[i]);
os_free(res->res);
os_free(res);
}

2
wpa_supplicant/Android.mk
View file

@ -1330,6 +1330,8 @@ OBJS += offchannel.c
L_CFLAGS += -DCONFIG_OFFCHANNEL
endif
OBJS += src/drivers/driver_common.c
OBJS_wpa_rm := ctrl_iface.c ctrl_iface_unix.c
OBJS_wpa := $(filter-out $(OBJS_wpa_rm),$(OBJS)) $(OBJS_h) tests/test_wpa.c
ifdef CONFIG_AUTHENTICATOR

2
wpa_supplicant/Makefile
View file

@ -1305,6 +1305,8 @@ OBJS += offchannel.o
CFLAGS += -DCONFIG_OFFCHANNEL
endif
OBJS += ../src/drivers/driver_common.o
OBJS_wpa_rm := ctrl_iface.o ctrl_iface_unix.o
OBJS_wpa := $(filter-out $(OBJS_wpa_rm),$(OBJS)) $(OBJS_h) tests/test_wpa.o
ifdef CONFIG_AUTHENTICATOR

2
wpa_supplicant/symbian/wpa_supplicant.mmp
View file

@ -15,7 +15,7 @@ SOURCE wpa_supplicant.c events.c
SOURCEPATH ..\..\src\rsn_supp
SOURCE wpa.c preauth.c pmksa_cache.c peerkey.c wpa_ie.c
SOURCEPATH ..\..\src\drivers
SOURCE drivers.c
SOURCE drivers.c driver_common.c
SOURCEPATH ..\..\src\common
SOURCE wpa_common.c
SOURCEPATH ..\..\src\utils

4
wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj
View file

@ -250,6 +250,10 @@
RelativePath="..\..\ctrl_iface_named_pipe.c"
>
</File>
<File
RelativePath="..\..\..\src\drivers\driver_common.c"
>
</File>
<File
RelativePath="..\..\..\src\eap_peer\eap.c"
>

4
wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj
View file

@ -250,6 +250,10 @@
RelativePath="..\..\ctrl_iface_named_pipe.c"
>
</File>
<File
RelativePath="..\..\..\src\drivers\driver_common.c"
>
</File>
<File
RelativePath="..\..\..\src\drivers\driver_ndis.c"
>

4
wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj
View file

@ -250,6 +250,10 @@
RelativePath="..\..\ctrl_iface_named_pipe.c"
>
</File>
<File
RelativePath="..\..\..\src\drivers\driver_common.c"
>
</File>
<File
RelativePath="..\..\..\src\drivers\driver_ndis.c"
>