---

yaml --- r: 159217 b: refs/heads/master c: f0166e5 h: refs/heads/master i: 159215: 2aade96 v: v3
git-mirror · Jul 23, 2009 · cd3f211 · cd3f211
1 parent f3a3c03
commit cd3f211
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 16 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 878fa89f97954337d1dc41f0ccc3a8b5f89cfbc7
+refs/heads/master: f0166e5e3cdab66d5a31f796ce18e21fd3ce99dc
diff --git a/trunk/drivers/ieee802154/fakehard.c b/trunk/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/trunk/include/net/ieee802154/af_ieee802154.h → trunk/include/net/af_ieee802154.h b/trunk/include/net/ieee802154/af_ieee802154.h → trunk/include/net/af_ieee802154.h
diff --git a/trunk/include/net/ieee802154/mac_def.h → trunk/include/net/ieee802154.h b/trunk/include/net/ieee802154/mac_def.h → trunk/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/trunk/include/net/ieee802154/netdevice.h → trunk/include/net/ieee802154_netdev.h b/trunk/include/net/ieee802154/netdevice.h → trunk/include/net/ieee802154_netdev.h
diff --git a/trunk/include/net/ieee802154/nl802154.h → trunk/include/net/nl802154.h b/trunk/include/net/ieee802154/nl802154.h → trunk/include/net/nl802154.h
diff --git a/trunk/net/ieee802154/af_ieee802154.c b/trunk/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/trunk/net/ieee802154/dgram.c b/trunk/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/trunk/net/ieee802154/netlink.c b/trunk/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/trunk/net/ieee802154/raw.c b/trunk/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"