From patchwork Thu Apr 26 09:35:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: alex.bluesman.smirnov@gmail.com X-Patchwork-Id: 155211 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 7E313B6FA7 for ; Thu, 26 Apr 2012 19:36:46 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755274Ab2DZJgk (ORCPT ); Thu, 26 Apr 2012 05:36:40 -0400 Received: from mail-we0-f174.google.com ([74.125.82.174]:46489 "EHLO mail-we0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750972Ab2DZJgi (ORCPT ); Thu, 26 Apr 2012 05:36:38 -0400 Received: by mail-we0-f174.google.com with SMTP id x9so622043wej.19 for ; Thu, 26 Apr 2012 02:36:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=fnazmWHhCqgQ6beIb+hCkIhVn17niAzAL5uQJSe4F5Q=; b=tRc8pO3zcaWlUitjHiJZdCGuoO3s/8npykA0bJX25PFqg29VTf8NbBVsfMfcTjnwqk goskVf33Wj7O5GkqebHCNkCRobnnZ4D7c2E5PgFHJAq2uh6T+jlmpu9mlLpLKMH9ZKlB WV0JqmN/qEl6cMFmdZLek+SB5Nc5A+qvl/Yn39cl8g98ydh7Ke1j1gbAL6P8E7akc0Kx PWFQ7CNTMSqOqpFBCfAsx+DvC0rTwZpiQLB7ssJ4m6lDB2JG91otuEhXoGLzvL6GQWBy T/Bj8ppL4JV7V89znQFhkA6+BrDJVO+yalkG5cR8Q08tz+6Yp4BV9Zg/q+n8ad5QX+zJ lcVg== Received: by 10.180.83.198 with SMTP id s6mr14780982wiy.8.1335432998245; Thu, 26 Apr 2012 02:36:38 -0700 (PDT) Received: from localhost.localdomain ([91.213.169.4]) by mx.google.com with ESMTPS id u9sm43633655wix.0.2012.04.26.02.36.36 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 Apr 2012 02:36:37 -0700 (PDT) From: Alexander Smirnov To: netdev@vger.kernel.org Cc: davem@davemloft.net, linux-zigbee-devel@lists.sourceforge.net, Alexander Smirnov Subject: [PATCH net-next 2/2] 6lowpan: duplicate definition of IEEE802154_ALEN Date: Thu, 26 Apr 2012 13:35:51 +0400 Message-Id: <1335432951-17340-3-git-send-email-alex.bluesman.smirnov@gmail.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1335432951-17340-1-git-send-email-alex.bluesman.smirnov@gmail.com> References: <1335432951-17340-1-git-send-email-alex.bluesman.smirnov@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- net/ieee802154/6lowpan.c | 4 ++-- 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 f406ac8..32eb417 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, 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 aeff3f3..8c2251f 100644 --- 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 */