diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-06-16 12:04:23 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-06-16 12:04:23 +0200 |
commit | 26918dd28ef6f2c6380ed23b384ddc8e98a8ad81 (patch) | |
tree | 77c5bd48717b9dbfd683937e3f70fc902b7c7119 /networking/udhcp/socket.c | |
parent | cab3a0127c3e6b7fc4f794ba6abcb8e01492118e (diff) | |
download | busybox-w32-26918dd28ef6f2c6380ed23b384ddc8e98a8ad81.tar.gz busybox-w32-26918dd28ef6f2c6380ed23b384ddc8e98a8ad81.tar.bz2 busybox-w32-26918dd28ef6f2c6380ed23b384ddc8e98a8ad81.zip |
udhcp: rename server/client_config.arp to server_mac and client_mac
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking/udhcp/socket.c')
-rw-r--r-- | networking/udhcp/socket.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/networking/udhcp/socket.c b/networking/udhcp/socket.c index 449fcb7aa..de494ca38 100644 --- a/networking/udhcp/socket.c +++ b/networking/udhcp/socket.c | |||
@@ -37,7 +37,7 @@ | |||
37 | #include "common.h" | 37 | #include "common.h" |
38 | 38 | ||
39 | 39 | ||
40 | int FAST_FUNC udhcp_read_interface(const char *interface, int *ifindex, uint32_t *nip, uint8_t *arp) | 40 | int FAST_FUNC udhcp_read_interface(const char *interface, int *ifindex, uint32_t *nip, uint8_t *mac) |
41 | { | 41 | { |
42 | int fd; | 42 | int fd; |
43 | struct ifreq ifr; | 43 | struct ifreq ifr; |
@@ -69,14 +69,14 @@ int FAST_FUNC udhcp_read_interface(const char *interface, int *ifindex, uint32_t | |||
69 | *ifindex = ifr.ifr_ifindex; | 69 | *ifindex = ifr.ifr_ifindex; |
70 | } | 70 | } |
71 | 71 | ||
72 | if (arp) { | 72 | if (mac) { |
73 | if (ioctl_or_warn(fd, SIOCGIFHWADDR, &ifr) != 0) { | 73 | if (ioctl_or_warn(fd, SIOCGIFHWADDR, &ifr) != 0) { |
74 | close(fd); | 74 | close(fd); |
75 | return -1; | 75 | return -1; |
76 | } | 76 | } |
77 | memcpy(arp, ifr.ifr_hwaddr.sa_data, 6); | 77 | memcpy(mac, ifr.ifr_hwaddr.sa_data, 6); |
78 | DEBUG("adapter hardware address %02x:%02x:%02x:%02x:%02x:%02x", | 78 | DEBUG("adapter hardware address %02x:%02x:%02x:%02x:%02x:%02x", |
79 | arp[0], arp[1], arp[2], arp[3], arp[4], arp[5]); | 79 | mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); |
80 | } | 80 | } |
81 | 81 | ||
82 | close(fd); | 82 | close(fd); |