[PATCH 03/35] NAN: Rename common/nan.h to common/nan_defs.h

[Andrei Otcheretianski]

From: Ilan Peer <ilan.peer at intel.com>

This commit renames the header file `common/nan.h` to
`common/nan_defs.h` to better reflect its purpose.

Signed-off-by: Ilan Peer <ilan.peer at intel.com>
---
 src/common/nan_de.c              | 2 +-
 src/common/nan_de.h              | 2 +-
 src/common/{nan.h => nan_defs.h} | 6 +++---
 src/drivers/driver.h             | 2 +-
 src/drivers/driver_nl80211.c     | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename src/common/{nan.h => nan_defs.h} (97%)

diff --git a/src/common/nan_de.c b/src/common/nan_de.c
index 69175224de..84de560993 100644
--- 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 b423544649..7391b2807f 100644
--- 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 e3985fb815..756c58c807 100644
--- 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 5d9fe82e73..49ff2ab4fc 100644
--- 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 bf9aeb22bb..e97eba7d1b 100644
--- 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"
-- 
2.49.0