Merge branch '6lowpan'
Alexander Aring says: ==================== 6lowpan: header cleanup this patch series fix a missing include of 6LoWPAN header and move it into the include/net directory. Since we did some code sharing with bluetooth 6LoWPAN the header turns into a generic header for 6LoWPAN. Instead to use a relative path in bluetooth 6LoWPAN we can now use include <net/6lowpan.h>. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
e86800f920
|
@ -53,6 +53,8 @@
|
|||
#ifndef __6LOWPAN_H__
|
||||
#define __6LOWPAN_H__
|
||||
|
||||
#include <net/ipv6.h>
|
||||
|
||||
#define UIP_802154_SHORTADDR_LEN 2 /* compressed ipv6 address length */
|
||||
#define UIP_IPH_LEN 40 /* ipv6 fixed header size */
|
||||
#define UIP_PROTO_UDP 17 /* ipv6 next header value for UDP */
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
#include "6lowpan.h"
|
||||
|
||||
#include "../ieee802154/6lowpan.h" /* for the compression support */
|
||||
#include <net/6lowpan.h> /* for the compression support */
|
||||
|
||||
#define IFACE_NAME_TEMPLATE "bt%d"
|
||||
#define EUI64_ADDR_LEN 8
|
||||
|
|
|
@ -54,11 +54,10 @@
|
|||
#include <linux/if_arp.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/netdevice.h>
|
||||
#include <net/6lowpan.h>
|
||||
#include <net/ipv6.h>
|
||||
#include <net/af_ieee802154.h>
|
||||
|
||||
#include "6lowpan.h"
|
||||
|
||||
/*
|
||||
* Uncompress address function for source and
|
||||
* destination address(non-multicast).
|
||||
|
|
|
@ -52,10 +52,10 @@
|
|||
#include <net/af_ieee802154.h>
|
||||
#include <net/ieee802154.h>
|
||||
#include <net/ieee802154_netdev.h>
|
||||
#include <net/6lowpan.h>
|
||||
#include <net/ipv6.h>
|
||||
|
||||
#include "reassembly.h"
|
||||
#include "6lowpan.h"
|
||||
|
||||
static LIST_HEAD(lowpan_devices);
|
||||
|
||||
|
|
|
@ -24,10 +24,10 @@
|
|||
#include <linux/export.h>
|
||||
|
||||
#include <net/ieee802154_netdev.h>
|
||||
#include <net/6lowpan.h>
|
||||
#include <net/ipv6.h>
|
||||
#include <net/inet_frag.h>
|
||||
|
||||
#include "6lowpan.h"
|
||||
#include "reassembly.h"
|
||||
|
||||
static struct inet_frags lowpan_frags;
|
||||
|
|
Loading…
Reference in a new issue