httpd: sendfile support

[oweals/busybox.git] / networking / nameif.c

diff --git a/networking/nameif.c b/networking/nameif.c
index 52aad287375b626f27415bf64b2b27250f412b9d..fd081fd63c1fe83b7121a0276f7439bd7fc0113a 100644 (file)
--- a/networking/nameif.c
+++ b/networking/nameif.c
@@ -9,7 +9,7 @@
  * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 #include <syslog.h>
 #include <net/if.h>
 #include <netinet/ether.h>
@@ -55,6 +55,7 @@ static struct ether_addr *cc_macaddr(const char *str_macaddr)
        return mac;
 }
 
+int nameif_main(int argc, char **argv);
 int nameif_main(int argc, char **argv)
 {
        mactable_t *clist = NULL;
@@ -147,9 +148,9 @@ int nameif_main(int argc, char **argv)
                        continue;
 
                strcpy(ifr.ifr_newname, ch->ifname);
-               if (ioctl(ctl_sk, SIOCSIFNAME, &ifr) < 0)
-                       bb_perror_msg_and_die("cannot change ifname %s to %s",
-                                  ifr.ifr_name, ch->ifname);
+               ioctl_or_perror_and_die(ctl_sk, SIOCSIFNAME, &ifr,
+                                       "cannot change ifname %s to %s",
+                                       ifr.ifr_name, ch->ifname);
 
                /* Remove list entry of renamed interface */
                if (ch->prev != NULL) {