From aea855d75217b58a9a8644bd537bbd4e23abbbb9 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sun, 13 Nov 2011 18:56:26 +0200 Subject: [PATCH] Move wpa_scan_results_free() into shared C file Replace the inline helper function with a new C file that can be used for common driver API related function. Signed-hostap: Jouni Malinen --- hostapd/Android.mk | 2 ++ hostapd/Makefile | 2 ++ src/drivers/driver.h | 14 ++------- src/drivers/driver_common.c | 30 +++++++++++++++++++ wpa_supplicant/Android.mk | 2 ++ wpa_supplicant/Makefile | 2 ++ wpa_supplicant/symbian/wpa_supplicant.mmp | 2 +- .../vs2005/eapol_test/eapol_test.vcproj | 4 +++ .../wpa_supplicant/wpa_supplicant.vcproj | 4 +++ wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj | 4 +++ 10 files changed, 53 insertions(+), 13 deletions(-) create mode 100644 src/drivers/driver_common.c diff --git a/hostapd/Android.mk b/hostapd/Android.mk index 2b53f03d8..44bc2a13b 100644 --- a/hostapd/Android.mk +++ b/hostapd/Android.mk @@ -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 diff --git a/hostapd/Makefile b/hostapd/Makefile index efa1011f7..e46561e70 100644 --- a/hostapd/Makefile +++ b/hostapd/Makefile @@ -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 diff --git a/src/drivers/driver.h b/src/drivers/driver.h index 06f2db32f..e84fe4410 100644 --- a/src/drivers/driver.h +++ b/src/drivers/driver.h @@ -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 */ diff --git a/src/drivers/driver_common.c b/src/drivers/driver_common.c new file mode 100644 index 000000000..3ea16e90a --- /dev/null +++ b/src/drivers/driver_common.c @@ -0,0 +1,30 @@ +/* + * Common driver-related functions + * Copyright (c) 2003-2011, Jouni Malinen + * + * 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); +} diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk index a717be448..7a76bc466 100644 --- a/wpa_supplicant/Android.mk +++ b/wpa_supplicant/Android.mk @@ -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 diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile index 3641a58d6..bb04db4d1 100644 --- a/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile @@ -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 diff --git a/wpa_supplicant/symbian/wpa_supplicant.mmp b/wpa_supplicant/symbian/wpa_supplicant.mmp index 217908e9b..e018e0569 100644 --- a/wpa_supplicant/symbian/wpa_supplicant.mmp +++ b/wpa_supplicant/symbian/wpa_supplicant.mmp @@ -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 diff --git a/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj b/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj index d96f6613c..38b29c486 100755 --- a/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj +++ b/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj @@ -250,6 +250,10 @@ RelativePath="..\..\ctrl_iface_named_pipe.c" > + + diff --git a/wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj b/wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj index e59cc6cce..e3886b7af 100755 --- a/wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj +++ b/wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj @@ -250,6 +250,10 @@ RelativePath="..\..\ctrl_iface_named_pipe.c" > + + diff --git a/wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj b/wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj index 4d402e5ce..103489104 100755 --- a/wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj +++ b/wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj @@ -250,6 +250,10 @@ RelativePath="..\..\ctrl_iface_named_pipe.c" > + +