Rename blacklist.[ch] to bssid_ignore.[ch]

This completes renaming of this functionality for a list of temporarily
ignored BSSIDs.

Signed-off-by: Jouni Malinen <j@w1.fi>

diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index a283f897ee66b13f0365d0af4810aa5839b49aa1..4cbce995c8507fb499f9b32cb5df791cffdb7d43 100644 (file)
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -1646,7 +1646,7 @@ endif
 
 OBJS += src/drivers/driver_common.c
 
-OBJS += wpa_supplicant.c events.c blacklist.c wpas_glue.c scan.c
+OBJS += wpa_supplicant.c events.c bssid_ignore.c wpas_glue.c scan.c
 OBJS_t := $(OBJS) $(OBJS_l2) eapol_test.c
 OBJS_t += src/radius/radius_client.c
 OBJS_t += src/radius/radius.c

diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 765edc07b7c3550b9aaa6e12249ccc74686028b8..59b054cd2a99b1f0109867e08f69767455e7fc64 100644 (file)
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -1792,7 +1792,7 @@ endif
 OBJS += ../src/drivers/driver_common.o
 OBJS_priv += ../src/drivers/driver_common.o
 
-OBJS += wpa_supplicant.o events.o blacklist.o wpas_glue.o scan.o
+OBJS += wpa_supplicant.o events.o bssid_ignore.o wpas_glue.o scan.o
 OBJS_t := $(OBJS) $(OBJS_l2) eapol_test.o
 OBJS_t += ../src/radius/radius_client.o
 OBJS_t += ../src/radius/radius.o

diff --git a/wpa_supplicant/blacklist.c b/wpa_supplicant/bssid_ignore.c
similarity index 99%
rename from wpa_supplicant/blacklist.c
rename to wpa_supplicant/bssid_ignore.c
index c0424a86b20463445c8b7aaefd4c1b907747c174..e37857798a0282daaac074d521e27d1f33d4f63b 100644 (file)
--- a/wpa_supplicant/blacklist.c
+++ b/wpa_supplicant/bssid_ignore.c
@@ -10,7 +10,7 @@
 
 #include "common.h"
 #include "wpa_supplicant_i.h"
-#include "blacklist.h"
+#include "bssid_ignore.h"
 
 /**
  * wpa_bssid_ignore_get - Get the ignore list entry for a BSSID

diff --git a/wpa_supplicant/blacklist.h b/wpa_supplicant/bssid_ignore.h
similarity index 100%
rename from wpa_supplicant/blacklist.h
rename to wpa_supplicant/bssid_ignore.h

diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
index 4df215503feb82c2a0495ffbabaf25faa71923ce..d6684451e604c7076b6d6fce5b70beb45c259309 100644 (file)
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
@@ -49,7 +49,7 @@
 #include "scan.h"
 #include "ctrl_iface.h"
 #include "interworking.h"
-#include "blacklist.h"
+#include "bssid_ignore.h"
 #include "autoscan.h"
 #include "wnm_sta.h"
 #include "offchannel.h"

diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index ec54970362970371143d00d6ceae4b3a9d579626..9abb197a1a391aee8e40af074ffaacbbd21d3e0a 100644 (file)
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -32,7 +32,7 @@
 #include "common/dpp.h"
 #include "common/ptksa_cache.h"
 #include "crypto/random.h"
-#include "blacklist.h"
+#include "bssid_ignore.h"
 #include "wpas_glue.h"
 #include "wps_supplicant.h"
 #include "ibss_rsn.h"

diff --git a/wpa_supplicant/hs20_supplicant.c b/wpa_supplicant/hs20_supplicant.c
index 50a8b5176dbcdbcd15a75f3271db540ec5896884..c1c823f2a85eb943c7a4eaead9b689539b6e5fba 100644 (file)
--- a/wpa_supplicant/hs20_supplicant.c
+++ b/wpa_supplicant/hs20_supplicant.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #include "scan.h"
 #include "bss.h"
-#include "blacklist.h"
+#include "bssid_ignore.h"
 #include "gas_query.h"
 #include "interworking.h"
 #include "hs20_supplicant.h"

diff --git a/wpa_supplicant/nmake.mak b/wpa_supplicant/nmake.mak
index 80e0ac8802bc9689c168678eb1a9bd0ad8e9d7df..617df036a9d2d6e67992f4a5a823db0347c2b9f0 100644 (file)
--- a/wpa_supplicant/nmake.mak
+++ b/wpa_supplicant/nmake.mak
@@ -114,7 +114,7 @@ OBJS = \
        $(OBJDIR)\driver_ndis_.obj \
        $(OBJDIR)\scan_helpers.obj \
        $(OBJDIR)\events.obj \
-       $(OBJDIR)\blacklist.obj \
+       $(OBJDIR)\bssid_ignore.obj \
        $(OBJDIR)\scan.obj \
        $(OBJDIR)\wpas_glue.obj \
        $(OBJDIR)\eap_register.obj \

diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index 1da2cbcf9f58932dce9b1abca4e0d14b69fb740c..db99d959702e8ee293a22fb0eddf50c11d9d5252 100644 (file)
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -44,7 +44,7 @@
 #include "common/ptksa_cache.h"
 #include "p2p/p2p.h"
 #include "fst/fst.h"
-#include "blacklist.h"
+#include "bssid_ignore.h"
 #include "wpas_glue.h"
 #include "wps_supplicant.h"
 #include "ibss_rsn.h"

diff --git a/wpa_supplicant/wpas_module_tests.c b/wpa_supplicant/wpas_module_tests.c
index 8ba3418779f14fb6d1fa267c56dfab8578b67cdd..ce5398cb851a29e285d2fd35a306c0d43ca8663b 100644 (file)
--- a/wpa_supplicant/wpas_module_tests.c
+++ b/wpa_supplicant/wpas_module_tests.c
@@ -11,7 +11,7 @@
 #include "utils/common.h"
 #include "utils/module_tests.h"
 #include "wpa_supplicant_i.h"
-#include "blacklist.h"
+#include "bssid_ignore.h"
 
 
 static int wpas_bssid_ignore_module_tests(void)

diff --git a/wpa_supplicant/wps_supplicant.c b/wpa_supplicant/wps_supplicant.c
index 7183a44817425da62dac1e17d23e3277005d1e1c..029349b08d209b4c4a75e81ed3128bc2e5d59c9c 100644 (file)
--- a/wpa_supplicant/wps_supplicant.c
+++ b/wpa_supplicant/wps_supplicant.c
@@ -26,7 +26,7 @@
 #include "wpa_supplicant_i.h"
 #include "driver_i.h"
 #include "notify.h"
-#include "blacklist.h"
+#include "bssid_ignore.h"
 #include "bss.h"
 #include "scan.h"
 #include "ap.h"