diff options
author | alex.bluesman.smirnov@gmail.com <alex.bluesman.smirnov@gmail.com> | 2012-04-25 19:35:51 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-26 06:01:09 -0400 |
commit | 2d319508a3551d2995e5cd12d649821b3be00e5b (patch) | |
tree | d930c931fce331d7dde1915f5acc556c3374350d /net/ieee802154 | |
parent | c2e94d73ea24df499f9183b7401e8d6b94efa417 (diff) |
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>
Diffstat (limited to 'net/ieee802154')
-rw-r--r-- | net/ieee802154/6lowpan.c | 4 | ||||
-rw-r--r-- | net/ieee802154/6lowpan.h | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c index ec03626a3114..4b5701c8bf97 100644 --- 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, | |||
196 | static void | 196 | static void |
197 | lowpan_uip_ds6_set_addr_iid(struct in6_addr *ipaddr, unsigned char *lladdr) | 197 | lowpan_uip_ds6_set_addr_iid(struct in6_addr *ipaddr, unsigned char *lladdr) |
198 | { | 198 | { |
199 | memcpy(&ipaddr->s6_addr[8], lladdr, IEEE802154_ALEN); | 199 | memcpy(&ipaddr->s6_addr[8], lladdr, IEEE802154_ADDR_LEN); |
200 | /* second bit-flip (Universe/Local) is done according RFC2464 */ | 200 | /* second bit-flip (Universe/Local) is done according RFC2464 */ |
201 | ipaddr->s6_addr[8] ^= 0x02; | 201 | ipaddr->s6_addr[8] ^= 0x02; |
202 | } | 202 | } |
@@ -221,7 +221,7 @@ lowpan_uncompress_addr(struct sk_buff *skb, struct in6_addr *ipaddr, | |||
221 | 221 | ||
222 | if (lladdr) | 222 | if (lladdr) |
223 | lowpan_raw_dump_inline(__func__, "linklocal address", | 223 | lowpan_raw_dump_inline(__func__, "linklocal address", |
224 | lladdr, IEEE802154_ALEN); | 224 | lladdr, IEEE802154_ADDR_LEN); |
225 | if (prefcount > 0) | 225 | if (prefcount > 0) |
226 | memcpy(ipaddr, prefix, prefcount); | 226 | memcpy(ipaddr, prefix, prefcount); |
227 | 227 | ||
diff --git a/net/ieee802154/6lowpan.h b/net/ieee802154/6lowpan.h index aeff3f310482..8c2251fb0a3f 100644 --- a/net/ieee802154/6lowpan.h +++ b/net/ieee802154/6lowpan.h | |||
@@ -53,9 +53,6 @@ | |||
53 | #ifndef __6LOWPAN_H__ | 53 | #ifndef __6LOWPAN_H__ |
54 | #define __6LOWPAN_H__ | 54 | #define __6LOWPAN_H__ |
55 | 55 | ||
56 | /* need to know address length to manipulate with it */ | ||
57 | #define IEEE802154_ALEN 8 | ||
58 | |||
59 | #define UIP_802154_SHORTADDR_LEN 2 /* compressed ipv6 address length */ | 56 | #define UIP_802154_SHORTADDR_LEN 2 /* compressed ipv6 address length */ |
60 | #define UIP_IPH_LEN 40 /* ipv6 fixed header size */ | 57 | #define UIP_IPH_LEN 40 /* ipv6 fixed header size */ |
61 | #define UIP_PROTO_UDP 17 /* ipv6 next header value for UDP */ | 58 | #define UIP_PROTO_UDP 17 /* ipv6 next header value for UDP */ |