aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2004-08-19 16:09:23 +0000
committerH. Peter Anvin <hpa@zytor.com>2004-08-19 16:09:23 +0000
commit11b180ac3f104f22c9fc0d76efc7b4454efd1467 (patch)
tree64691875e139f85ad742a13733903c875af777c8
parentfa2a4ca07c34d16af04503eef4807cb0923591a6 (diff)
downloadklibc-11b180ac3f104f22c9fc0d76efc7b4454efd1467.tar.gz
Fix merge errorsklibc-0.164
-rw-r--r--ipconfig/main.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/ipconfig/main.c b/ipconfig/main.c
index 8845146974f2e..dcd767fc3208d 100644
--- a/ipconfig/main.c
+++ b/ipconfig/main.c
@@ -439,18 +439,7 @@ static unsigned int parse_proto(const char *ip)
return caps;
}
-static void bringup_device(struct netdev *dev)
-{
- if (netdev_up(dev) == 0) {
- if (dev->caps) {
- add_one_dev(dev);
- } else {
- complete_device(dev);
- }
- }
-}
-
-static void add_all_devices(struct netdev *template);
+static int add_all_devices(struct netdev *template);
static int parse_device(struct netdev *dev, const char *ip)
{