From f0166e5e3cdab66d5a31f796ce18e21fd3ce99dc Mon Sep 17 00:00:00 2001
From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Date: Thu, 23 Jul 2009 16:56:29 +0400
Subject: [PATCH] ieee802154: move headers out of extra directory

include/net/ieee802154/af_ieee802154.h (and others) naming seems to be too long
and redundant. Drop one level of subdirectories.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 drivers/ieee802154/fakehard.c                             | 8 ++++----
 include/net/{ieee802154 => }/af_ieee802154.h              | 0
 include/net/{ieee802154/mac_def.h => ieee802154.h}        | 4 ++--
 .../net/{ieee802154/netdevice.h => ieee802154_netdev.h}   | 0
 include/net/{ieee802154 => }/nl802154.h                   | 0
 net/ieee802154/af_ieee802154.c                            | 4 ++--
 net/ieee802154/dgram.c                                    | 6 +++---
 net/ieee802154/netlink.c                                  | 6 +++---
 net/ieee802154/raw.c                                      | 2 +-
 9 files changed, 15 insertions(+), 15 deletions(-)
 rename include/net/{ieee802154 => }/af_ieee802154.h (100%)
 rename include/net/{ieee802154/mac_def.h => ieee802154.h} (98%)
 rename include/net/{ieee802154/netdevice.h => ieee802154_netdev.h} (100%)
 rename include/net/{ieee802154 => }/nl802154.h (100%)

diff --git a/drivers/ieee802154/fakehard.c b/drivers/ieee802154/fakehard.c
index 9ec07e8552f..8a52e6efa23 100644
--- a/drivers/ieee802154/fakehard.c
+++ b/drivers/ieee802154/fakehard.c
@@ -26,10 +26,10 @@
 #include <linux/skbuff.h>
 #include <linux/if_arp.h>
 
-#include <net/ieee802154/af_ieee802154.h>
-#include <net/ieee802154/netdevice.h>
-#include <net/ieee802154/mac_def.h>
-#include <net/ieee802154/nl802154.h>
+#include <net/af_ieee802154.h>
+#include <net/ieee802154_netdev.h>
+#include <net/ieee802154.h>
+#include <net/nl802154.h>
 
 /**
  * fake_get_pan_id - Retrieve the PAN ID of the device.
diff --git a/include/net/ieee802154/af_ieee802154.h b/include/net/af_ieee802154.h
similarity index 100%
rename from include/net/ieee802154/af_ieee802154.h
rename to include/net/af_ieee802154.h
diff --git a/include/net/ieee802154/mac_def.h b/include/net/ieee802154.h
similarity index 98%
rename from include/net/ieee802154/mac_def.h
rename to include/net/ieee802154.h
index 8cb68463565..d52685defb1 100644
--- a/include/net/ieee802154/mac_def.h
+++ b/include/net/ieee802154.h
@@ -23,8 +23,8 @@
  * Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
  */
 
-#ifndef IEEE802154_MAC_DEF_H
-#define IEEE802154_MAC_DEF_H
+#ifndef NET_IEEE802154_H
+#define NET_IEEE802154_H
 
 #define IEEE802154_FC_TYPE_BEACON	0x0	/* Frame is beacon */
 #define	IEEE802154_FC_TYPE_DATA		0x1	/* Frame is data */
diff --git a/include/net/ieee802154/netdevice.h b/include/net/ieee802154_netdev.h
similarity index 100%
rename from include/net/ieee802154/netdevice.h
rename to include/net/ieee802154_netdev.h
diff --git a/include/net/ieee802154/nl802154.h b/include/net/nl802154.h
similarity index 100%
rename from include/net/ieee802154/nl802154.h
rename to include/net/nl802154.h
diff --git a/net/ieee802154/af_ieee802154.c b/net/ieee802154/af_ieee802154.c
index 3bb6bdb1dac..69c8d9207aa 100644
--- a/net/ieee802154/af_ieee802154.c
+++ b/net/ieee802154/af_ieee802154.c
@@ -34,8 +34,8 @@
 #include <net/tcp_states.h>
 #include <net/route.h>
 
-#include <net/ieee802154/af_ieee802154.h>
-#include <net/ieee802154/netdevice.h>
+#include <net/af_ieee802154.h>
+#include <net/ieee802154_netdev.h>
 
 #include "af802154.h"
 
diff --git a/net/ieee802154/dgram.c b/net/ieee802154/dgram.c
index 14d39840dd6..53dd912d52b 100644
--- a/net/ieee802154/dgram.c
+++ b/net/ieee802154/dgram.c
@@ -26,9 +26,9 @@
 #include <linux/if_arp.h>
 #include <linux/list.h>
 #include <net/sock.h>
-#include <net/ieee802154/af_ieee802154.h>
-#include <net/ieee802154/mac_def.h>
-#include <net/ieee802154/netdevice.h>
+#include <net/af_ieee802154.h>
+#include <net/ieee802154.h>
+#include <net/ieee802154_netdev.h>
 
 #include <asm/ioctls.h>
 
diff --git a/net/ieee802154/netlink.c b/net/ieee802154/netlink.c
index 27eda9fdf3c..a615b9d1321 100644
--- a/net/ieee802154/netlink.c
+++ b/net/ieee802154/netlink.c
@@ -27,9 +27,9 @@
 #include <net/netlink.h>
 #include <net/genetlink.h>
 #include <linux/nl802154.h>
-#include <net/ieee802154/af_ieee802154.h>
-#include <net/ieee802154/nl802154.h>
-#include <net/ieee802154/netdevice.h>
+#include <net/af_ieee802154.h>
+#include <net/nl802154.h>
+#include <net/ieee802154_netdev.h>
 
 static unsigned int ieee802154_seq_num;
 
diff --git a/net/ieee802154/raw.c b/net/ieee802154/raw.c
index fca44d59f97..ea8d1f15206 100644
--- a/net/ieee802154/raw.c
+++ b/net/ieee802154/raw.c
@@ -26,7 +26,7 @@
 #include <linux/if_arp.h>
 #include <linux/list.h>
 #include <net/sock.h>
-#include <net/ieee802154/af_ieee802154.h>
+#include <net/af_ieee802154.h>
 
 #include "af802154.h"
 
-- 
2.39.5