From patchwork Thu May 15 13:10:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 349218 X-Patchwork-Delegate: shemminger@vyatta.com 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 447001400DE for ; Thu, 15 May 2014 23:10:40 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753335AbaEONKe (ORCPT ); Thu, 15 May 2014 09:10:34 -0400 Received: from mail-la0-f51.google.com ([209.85.215.51]:46099 "EHLO mail-la0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751497AbaEONKc (ORCPT ); Thu, 15 May 2014 09:10:32 -0400 Received: by mail-la0-f51.google.com with SMTP id gf5so782870lab.10 for ; Thu, 15 May 2014 06:10:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=YElSKkzNmUUWy1iQt4uWfwsNOUEZKJxU02KTFNteDdg=; b=dBNq02cexSbcV4UAjkoDY9BT9UMDCgUbiFv1bdPNyKbP6TtMBW44GLKmb2jc7J1kJE ZRoPGPTo7ysIIfSJ0jzjtuIDwpbI/FxDg1VkIX4di37abx8vtQUkluLClzYunxwMfr74 GFF5O6wBhK61VAMMUO+06ao9gTiBYRGSWnX2HAfg0pQGZBNvip8377j0B4ZZo5ArCYXP l/Cq4988eEJMPmSNsMKzAYXv6ZDJd/WUpwxEIfv9U5rVBoskuQZ4l0ekXs1NGp05BU5X Lx0b8Eltxjq/bVM35oujJCUGduWALWvPhr7xNGzzG5vHG6r7o8YNtwc2nwvrmzeu/2Dh z5RA== X-Gm-Message-State: ALoCoQkf/SNGrbWNC6IKDHaQq50EfBdi6Ggx4+Xvx09aJw+CgUV+Z4rit2Sw71NGfAnjh8K44yjL X-Received: by 10.152.37.72 with SMTP id w8mr1229803laj.71.1400159430870; Thu, 15 May 2014 06:10:30 -0700 (PDT) Received: from localhost (ip-94-113-121-85.net.upcbroadband.cz. [94.113.121.85]) by mx.google.com with ESMTPSA id yr11sm5373800lbb.5.2014.05.15.06.10.28 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 May 2014 06:10:29 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: stephen@networkplumber.org, mschmidt@redhat.com Subject: [patch iproute2 1/3] iproute2: arpd: use ll_addr_a2n and ll_addr_n2a Date: Thu, 15 May 2014 15:10:20 +0200 Message-Id: <1400159422-11797-2-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1400159422-11797-1-git-send-email-jiri@resnulli.us> References: <1400159422-11797-1-git-send-email-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Jiri Pirko --- misc/arpd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/misc/arpd.c b/misc/arpd.c index bfe7de9..0839e3f 100644 --- a/misc/arpd.c +++ b/misc/arpd.c @@ -36,6 +36,7 @@ #include "libnetlink.h" #include "utils.h" +#include "rt_names.h" int resolve_hosts; @@ -721,8 +722,7 @@ int main(int argc, char **argv) goto do_abort; } - dbdat.data = hexstring_a2n(macbuf, b1, 6); - if (dbdat.data == NULL) + if (ll_addr_a2n((char *) b1, 6, macbuf) != 6) goto do_abort; dbdat.size = 6; @@ -747,7 +747,7 @@ int main(int argc, char **argv) printf("%-8d %-15s %s\n", key->iface, inet_ntoa(*(struct in_addr*)&key->addr), - hexstring_n2a(dbdat.data, 6, b1, 18)); + ll_addr_n2a(dbdat.data, 6, ARPHRD_ETHER, b1, 18)); } else { printf("%-8d %-15s FAILED: %dsec ago\n", key->iface,