[PATCH BlueZ] mesh: Fix for file naming convention
From: Brian Gix <hidden>
Date: 2019-02-20 23:24:40
Subsystem:
the rest · Maintainer:
Linus Torvalds
---
Makefile.mesh | 2 +-
mesh/friend.c | 2 +-
mesh/{net_keys.c => net-keys.c} | 2 +-
mesh/{net_keys.h => net-keys.h} | 0
mesh/net.c | 2 +-
mesh/pb-adv.c | 2 +-
mesh/prov-acceptor.c | 2 +-
mesh/prov-initiator.c | 2 +-
8 files changed, 7 insertions(+), 7 deletions(-)
rename mesh/{net_keys.c => net-keys.c} (99%)
rename mesh/{net_keys.h => net-keys.h} (100%)
diff --git a/Makefile.mesh b/Makefile.mesh
index 28c87a061..76e424b92 100644
--- a/Makefile.mesh
+++ b/Makefile.mesh@@ -5,7 +5,7 @@ dbus_DATA += mesh/bluetooth-mesh.conf endif mesh_sources = mesh/mesh.h mesh/mesh.c \ - mesh/net_keys.h mesh/net_keys.c \ + mesh/net-keys.h mesh/net-keys.c \ mesh/mesh-io.h mesh/mesh-io.c \ mesh/error.h mesh/mesh-io-api.h \ mesh/mesh-io-generic.h \
diff --git a/mesh/friend.c b/mesh/friend.c
index d17fde084..1722a2e71 100644
--- a/mesh/friend.c
+++ b/mesh/friend.c@@ -29,7 +29,7 @@ #include "mesh/mesh-defs.h" #include "mesh/mesh.h" -#include "mesh/net_keys.h" +#include "mesh/net-keys.h" #include "mesh/node.h" #include "mesh/net.h" #include "mesh/crypto.h"
diff --git a/mesh/net_keys.c b/mesh/net-keys.c
similarity index 99%
rename from mesh/net_keys.c
rename to mesh/net-keys.c
index 6f7b7c18a..84e3982f5 100644
--- a/mesh/net_keys.c
+++ b/mesh/net-keys.c@@ -25,7 +25,7 @@ #include <ell/ell.h> #include "mesh/crypto.h" -#include "mesh/net_keys.h" +#include "mesh/net-keys.h" #define BEACON_TYPE_SNB 0x01 #define KEY_REFRESH 0x01
diff --git a/mesh/net_keys.h b/mesh/net-keys.h
similarity index 100%
rename from mesh/net_keys.h
rename to mesh/net-keys.h
diff --git a/mesh/net.c b/mesh/net.c
index 53010d57f..2adae70c3 100644
--- a/mesh/net.c
+++ b/mesh/net.c@@ -32,7 +32,7 @@ #include "mesh/util.h" #include "mesh/crypto.h" -#include "mesh/net_keys.h" +#include "mesh/net-keys.h" #include "mesh/mesh.h" #include "mesh/node.h" #include "mesh/net.h"
diff --git a/mesh/pb-adv.c b/mesh/pb-adv.c
index 57647e184..a6104ca89 100644
--- a/mesh/pb-adv.c
+++ b/mesh/pb-adv.c@@ -39,7 +39,7 @@ #include "src/shared/ecc.h" #include "mesh/util.h" -#include "mesh/net_keys.h" +#include "mesh/net-keys.h" #include "mesh/crypto.h" #include "mesh/net.h" #include "mesh/mesh-io.h"
diff --git a/mesh/prov-acceptor.c b/mesh/prov-acceptor.c
index 3d4d93ba4..a8bc2c9cf 100644
--- a/mesh/prov-acceptor.c
+++ b/mesh/prov-acceptor.c@@ -39,7 +39,7 @@ #include "src/shared/ecc.h" #include "mesh/util.h" -#include "mesh/net_keys.h" +#include "mesh/net-keys.h" #include "mesh/crypto.h" #include "mesh/net.h" #include "mesh/error.h"
diff --git a/mesh/prov-initiator.c b/mesh/prov-initiator.c
index d915f2aaf..df8884a81 100644
--- a/mesh/prov-initiator.c
+++ b/mesh/prov-initiator.c@@ -39,7 +39,7 @@ #include "src/shared/ecc.h" #include "mesh/util.h" -#include "mesh/net_keys.h" +#include "mesh/net-keys.h" #include "mesh/crypto.h" #include "mesh/net.h" #include "mesh/error.h"
--
2.14.5