Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e86800f9 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 5a8a1ab7 cefc8c8a

net/ieee802154/6lowpan.h→include/net/6lowpan.h

+2 −0
Original line number Diff line number Diff line
@@ -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 */

net/bluetooth/6lowpan.c

+1 −1
Original line number Diff line number Diff line
@@ -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

net/ieee802154/6lowpan_iphc.c

+1 −2
Original line number Diff line number Diff line
@@ -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).

net/ieee802154/6lowpan_rtnl.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

net/ieee802154/reassembly.c

+1 −1
Original line number Diff line number Diff line
@@ -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;