ieee802154: 6lowpan: rename internal header

This patch renames the internal header for af802154. This naming
convention is like ieee802154_i.h in mac802154 and avoids naming
confusing with the global af802154 header. Furthermore this header
contains more ieee802154 specific definitions.

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/net/ieee802154/6lowpan/reassembly.h b/net/ieee802154/6lowpan/6lowpan_i.h
similarity index 85%
rename from net/ieee802154/6lowpan/reassembly.h
rename to net/ieee802154/6lowpan/6lowpan_i.h
index 836b16fa001f19852fec7f2890b8ef303d2c0773..edbe80314b7d9959246e35aa37c7951c7b1a8822 100644 (file)
--- a/net/ieee802154/6lowpan/reassembly.h
+++ b/net/ieee802154/6lowpan/6lowpan_i.h
@@ -1,5 +1,5 @@
-#ifndef __IEEE802154_6LOWPAN_REASSEMBLY_H__
-#define __IEEE802154_6LOWPAN_REASSEMBLY_H__
+#ifndef __IEEE802154_6LOWPAN_I_H__
+#define __IEEE802154_6LOWPAN_I_H__
 
 #include <net/inet_frag.h>
 
@@ -38,4 +38,4 @@ int lowpan_frag_rcv(struct sk_buff *skb, const u8 frag_type);
 void lowpan_net_frag_exit(void);
 int lowpan_net_frag_init(void);
 
-#endif /* __IEEE802154_6LOWPAN_REASSEMBLY_H__ */
+#endif /* __IEEE802154_6LOWPAN_I_H__ */

diff --git a/net/ieee802154/6lowpan/6lowpan_rtnl.c b/net/ieee802154/6lowpan/6lowpan_rtnl.c
index 27eaa65e88e16ad51a70c33711f6f91d0e8fd61c..1918c43499ced01607b1d30e9f1431e97fd266ce 100644 (file)
--- a/net/ieee802154/6lowpan/6lowpan_rtnl.c
+++ b/net/ieee802154/6lowpan/6lowpan_rtnl.c
@@ -55,7 +55,7 @@
 #include <net/6lowpan.h>
 #include <net/ipv6.h>
 
-#include "reassembly.h"
+#include "6lowpan_i.h"
 
 static LIST_HEAD(lowpan_devices);
 static int lowpan_open_count;

diff --git a/net/ieee802154/6lowpan/reassembly.c b/net/ieee802154/6lowpan/reassembly.c
index 9d980ed3ffe2c5ed5d1683f9ee1a962751706e21..f46e4d1306f26363643c054f64d62a9acb39151e 100644 (file)
--- a/net/ieee802154/6lowpan/reassembly.c
+++ b/net/ieee802154/6lowpan/reassembly.c
@@ -28,7 +28,7 @@
 #include <net/ipv6.h>
 #include <net/inet_frag.h>
 
-#include "reassembly.h"
+#include "6lowpan_i.h"
 
 static const char lowpan_frags_cache_name[] = "lowpan-frags";