NAN: Rename common/nan.h to common/nan_defs.h

Rename the header file common/nan.h to common/nan_defs.h to better
reflect its purpose.

Signed-off-by: Ilan Peer <ilan.peer@intel.com>

diff --git a/src/common/nan_de.c b/src/common/nan_de.c
index 2bf9dcdad7e01c60914a7ed2e98b48d6fbf11245..9d2f6bc04a64e3e4694ec4e1064ff909d2cef679 100644 (file)
--- a/src/common/nan_de.c
+++ b/src/common/nan_de.c
@@ -13,7 +13,7 @@
 #include "crypto/crypto.h"
 #include "crypto/sha256.h"
 #include "ieee802_11_defs.h"
-#include "nan.h"
+#include "nan_defs.h"
 #include "nan_de.h"
 
 static const u8 nan_network_id[ETH_ALEN] =

diff --git a/src/common/nan_de.h b/src/common/nan_de.h
index a8e40bde0019e13a7d0d32c30195071cbee68fba..506188edaaad98c6379596a5e3685c57ab7ee6fc 100644 (file)
--- a/src/common/nan_de.h
+++ b/src/common/nan_de.h
@@ -9,7 +9,7 @@
 #ifndef NAN_DE_H
 #define NAN_DE_H
 
-#include "nan.h"
+#include "nan_defs.h"
 
 /* Maximum number of active local publish and subscribe instances */
 #ifndef NAN_DE_MAX_SERVICE

diff --git a/src/common/nan.h b/src/common/nan_defs.h
similarity index 97%
rename from src/common/nan.h
rename to src/common/nan_defs.h
index 03c6d6df4032912528a4259a4cbdc23dc3b6df6d..3e8a6e83ac1501322d263c54f0d98c673397e162 100644 (file)
--- a/src/common/nan.h
+++ b/src/common/nan_defs.h
@@ -6,8 +6,8 @@
  * See README for more details.
  */
 
-#ifndef NAN_H
-#define NAN_H
+#ifndef NAN_DEFS_H
+#define NAN_DEFS_H
 
 enum nan_attr_id {
        NAN_ATTR_MASTER_INDICATION = 0x00,
@@ -95,4 +95,4 @@ enum nan_service_protocol_type {
 
 #define NAN_USD_DEFAULT_FREQ 2437
 
-#endif /* NAN_H */
+#endif /* NAN_DEFS_H */

diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index cc19a986191764e7368c0f5b62c550aa6319db86..8035f1ae8149d70286477cf0d463551ec62a94b8 100644 (file)
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -22,7 +22,7 @@
 #include "common/defs.h"
 #include "common/ieee802_11_defs.h"
 #include "common/wpa_common.h"
-#include "common/nan.h"
+#include "common/nan_defs.h"
 #ifdef CONFIG_MACSEC
 #include "pae/ieee802_1x_kay.h"
 #endif /* CONFIG_MACSEC */

diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index 24516637ee15d2ec4c43d684f35023fe7ed0ff54..2094cd406cbdea340d62334b31d334d9c77ccaa7 100644 (file)
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -30,7 +30,7 @@
 #include "common/ieee802_11_defs.h"
 #include "common/ieee802_11_common.h"
 #include "common/wpa_common.h"
-#include "common/nan.h"
+#include "common/nan_defs.h"
 #include "common/nan_de.h"
 #include "crypto/sha256.h"
 #include "crypto/sha384.h"