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>

diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
index ec03626a31145ea627a776aded62c16b805cbe74..4b5701c8bf974c9f45a619040e48b9d2c9155eb1 100644 (file)
--- a/net/ieee802154/6lowpan.c
+++ b/net/ieee802154/6lowpan.c
@@ -196,7 +196,7 @@ lowpan_compress_addr_64(u8 **hc06_ptr, u8 shift, const struct in6_addr *ipaddr,
 static void
 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 */
        ipaddr->s6_addr[8] ^= 0x02;
 }
@@ -221,7 +221,7 @@ lowpan_uncompress_addr(struct sk_buff *skb, struct in6_addr *ipaddr,
 
        if (lladdr)
                lowpan_raw_dump_inline(__func__, "linklocal address",
-                                               lladdr, IEEE802154_ALEN);
+                                               lladdr, IEEE802154_ADDR_LEN);
        if (prefcount > 0)
                memcpy(ipaddr, prefix, prefcount);
 

diff --git a/net/ieee802154/6lowpan.h b/net/ieee802154/6lowpan.h
index aeff3f3104821ab3bdead00ed070d5d3fbb5164d..8c2251fb0a3fb5ba9347710e4682bdb273d49af9 100644 (file)
--- a/net/ieee802154/6lowpan.h
+++ b/net/ieee802154/6lowpan.h
@@ -53,9 +53,6 @@
 #ifndef __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_IPH_LEN                    40 /* ipv6 fixed header size */
 #define UIP_PROTO_UDP                  17 /* ipv6 next header value for UDP */