UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

6lowpan: duplicate definition of IEEE802154_ALEN 

The same macros is defined in 'include/net/af_ieee802154.h' and is called
IEEE802154_ADDR_LEN. No need another one, so remove it.

Signed-off-by: Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
alex.bluesman.smirnov@gmail.com 2012-04-25 23:35:51 +00:00 committed by David S. Miller
parent c2e94d73ea
commit 2d319508a3
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/ieee802154/6lowpan.c
View File

@ -196,7 +196,7 @@ lowpan_compress_addr_64(u8 **hc06_ptr, u8 shift, const struct in6_addr *ipaddr,
static void static void
lowpan_uip_ds6_set_addr_iid(struct in6_addr *ipaddr, unsigned char *lladdr) lowpan_uip_ds6_set_addr_iid(struct in6_addr *ipaddr, unsigned char *lladdr)
{ {
memcpy(&ipaddr->s6_addr[8], lladdr, IEEE802154_ALEN); memcpy(&ipaddr->s6_addr[8], lladdr, IEEE802154_ADDR_LEN);
/* second bit-flip (Universe/Local) is done according RFC2464 */ /* second bit-flip (Universe/Local) is done according RFC2464 */
ipaddr->s6_addr[8] ^= 0x02; ipaddr->s6_addr[8] ^= 0x02;
} }
@ -221,7 +221,7 @@ lowpan_uncompress_addr(struct sk_buff *skb, struct in6_addr *ipaddr,
if (lladdr) if (lladdr)
lowpan_raw_dump_inline(__func__, "linklocal address", lowpan_raw_dump_inline(__func__, "linklocal address",
lladdr, IEEE802154_ALEN); lladdr, IEEE802154_ADDR_LEN);
if (prefcount > 0) if (prefcount > 0)
memcpy(ipaddr, prefix, prefcount); memcpy(ipaddr, prefix, prefcount);

3
net/ieee802154/6lowpan.h
View File

@ -53,9 +53,6 @@
#ifndef __6LOWPAN_H__ #ifndef __6LOWPAN_H__
#define __6LOWPAN_H__ #define __6LOWPAN_H__
/* need to know address length to manipulate with it */
#define IEEE802154_ALEN 8
#define UIP_802154_SHORTADDR_LEN 2 /* compressed ipv6 address length */ #define UIP_802154_SHORTADDR_LEN 2 /* compressed ipv6 address length */
#define UIP_IPH_LEN 40 /* ipv6 fixed header size */ #define UIP_IPH_LEN 40 /* ipv6 fixed header size */
#define UIP_PROTO_UDP 17 /* ipv6 next header value for UDP */ #define UIP_PROTO_UDP 17 /* ipv6 next header value for UDP */