X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Flibiproute%2Fll_addr.c;h=ba0a65a18c3b7242efad08e7500bf5ab4c9f6a41;hb=28703015ab71784f40bc97f720ed900e26bd03ca;hp=08d5b78f81847514f59c82e0a9baff798046a3cf;hpb=ea2a1064b33bfb4fe0493659f43ed074cfe80067;p=oweals%2Fbusybox.git

diff --git a/networking/libiproute/ll_addr.c b/networking/libiproute/ll_addr.c
index 08d5b78f8..ba0a65a18 100644
--- a/networking/libiproute/ll_addr.c
+++ b/networking/libiproute/ll_addr.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * ll_addr.c
  *
@@ -9,15 +10,14 @@
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
 
-#include <arpa/inet.h>
-#include <string.h>
+#include "libbb.h"
 
-#define sysinfo kernel_sysinfo
-#include <linux/if_arp.h>
-#undef sysinfo
+#include <string.h>
+#include <net/if_arp.h>
 
+#include "rt_names.h"
 #include "utils.h"
-#include "libbb.h"
+
 
 const char *ll_addr_n2a(unsigned char *addr, int alen, int type, char *buf, int blen)
 {
@@ -48,7 +48,7 @@ int ll_addr_a2n(unsigned char *lladdr, int len, char *arg)
 	if (strchr(arg, '.')) {
 		inet_prefix pfx;
 		if (get_addr_1(&pfx, arg, AF_INET)) {
-			error_msg("\"%s\" is invalid lladdr.", arg);
+			bb_error_msg("\"%s\" is invalid lladdr", arg);
 			return -1;
 		}
 		if (len < 4) {
@@ -67,11 +67,11 @@ int ll_addr_a2n(unsigned char *lladdr, int len, char *arg)
 				cp++;
 			}
 			if (sscanf(arg, "%x", &temp) != 1) {
-				error_msg("\"%s\" is invalid lladdr.", arg);
+				bb_error_msg("\"%s\" is invalid lladdr", arg);
 				return -1;
 			}
 			if (temp < 0 || temp > 255) {
-				error_msg("\"%s\" is invalid lladdr.", arg);
+				bb_error_msg("\"%s\" is invalid lladdr", arg);
 				return -1;
 			}
 			lladdr[i] = temp;