Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+15 -15
+4 -4
drivers/ieee802154/fakehard.c
··· 26 26 #include <linux/skbuff.h> 27 27 #include <linux/if_arp.h> 28 28 29 - #include <net/ieee802154/af_ieee802154.h> 30 - #include <net/ieee802154/netdevice.h> 31 - #include <net/ieee802154/mac_def.h> 32 - #include <net/ieee802154/nl802154.h> 29 + #include <net/af_ieee802154.h> 30 + #include <net/ieee802154_netdev.h> 31 + #include <net/ieee802154.h> 32 + #include <net/nl802154.h> 33 33 34 34 /** 35 35 * fake_get_pan_id - Retrieve the PAN ID of the device.
include/net/ieee802154/af_ieee802154.h include/net/af_ieee802154.h
+2 -2
include/net/ieee802154/mac_def.h include/net/ieee802154.h
··· 23 23 * Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> 24 24 */ 25 25 26 - #ifndef IEEE802154_MAC_DEF_H 27 - #define IEEE802154_MAC_DEF_H 26 + #ifndef NET_IEEE802154_H 27 + #define NET_IEEE802154_H 28 28 29 29 #define IEEE802154_FC_TYPE_BEACON 0x0 /* Frame is beacon */ 30 30 #define IEEE802154_FC_TYPE_DATA 0x1 /* Frame is data */
include/net/ieee802154/netdevice.h include/net/ieee802154_netdev.h
include/net/ieee802154/nl802154.h include/net/nl802154.h
+2 -2
net/ieee802154/af_ieee802154.c
··· 34 34 #include <net/tcp_states.h> 35 35 #include <net/route.h> 36 36 37 - #include <net/ieee802154/af_ieee802154.h> 38 - #include <net/ieee802154/netdevice.h> 37 + #include <net/af_ieee802154.h> 38 + #include <net/ieee802154_netdev.h> 39 39 40 40 #include "af802154.h" 41 41
+3 -3
net/ieee802154/dgram.c
··· 26 26 #include <linux/if_arp.h> 27 27 #include <linux/list.h> 28 28 #include <net/sock.h> 29 - #include <net/ieee802154/af_ieee802154.h> 30 - #include <net/ieee802154/mac_def.h> 31 - #include <net/ieee802154/netdevice.h> 29 + #include <net/af_ieee802154.h> 30 + #include <net/ieee802154.h> 31 + #include <net/ieee802154_netdev.h> 32 32 33 33 #include <asm/ioctls.h> 34 34
+3 -3
net/ieee802154/netlink.c
··· 27 27 #include <net/netlink.h> 28 28 #include <net/genetlink.h> 29 29 #include <linux/nl802154.h> 30 - #include <net/ieee802154/af_ieee802154.h> 31 - #include <net/ieee802154/nl802154.h> 32 - #include <net/ieee802154/netdevice.h> 30 + #include <net/af_ieee802154.h> 31 + #include <net/nl802154.h> 32 + #include <net/ieee802154_netdev.h> 33 33 34 34 static unsigned int ieee802154_seq_num; 35 35
+1 -1
net/ieee802154/raw.c
··· 26 26 #include <linux/if_arp.h> 27 27 #include <linux/list.h> 28 28 #include <net/sock.h> 29 - #include <net/ieee802154/af_ieee802154.h> 29 + #include <net/af_ieee802154.h> 30 30 31 31 #include "af802154.h" 32 32