From bcfb347ac12ce908a1e48a0b3bbea58b29c78fcb Mon Sep 17 00:00:00 2001 From: Neil Horman Date: Tue, 22 Nov 2005 14:56:32 -0800 Subject: [PATCH] --- yaml --- r: 14635 b: refs/heads/master c: e6d184e33109010412ad1d59719af74755a935f4 h: refs/heads/master i: 14633: ca344380b6d6f8aee962d01e8f0d37202b3e04ec 14631: a9944c6aace6fb89d4d726282ea5cb2c9c3484b0 v: v3 --- [refs] | 2 +- trunk/Documentation/networking/ifenslave.c | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 5197e4878399..9f5a73c7df81 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 00cb277a4a1fb76aafb2fb28aa99f30546e619c5 +refs/heads/master: e6d184e33109010412ad1d59719af74755a935f4 diff --git a/trunk/Documentation/networking/ifenslave.c b/trunk/Documentation/networking/ifenslave.c index f315d20d3867..545447ac503a 100644 --- a/trunk/Documentation/networking/ifenslave.c +++ b/trunk/Documentation/networking/ifenslave.c @@ -693,13 +693,7 @@ static int enslave(char *master_ifname, char *slave_ifname) /* Older bonding versions would panic if the slave has no IP * address, so get the IP setting from the master. */ - res = set_if_addr(master_ifname, slave_ifname); - if (res) { - fprintf(stderr, - "Slave '%s': Error: set address failed\n", - slave_ifname); - return res; - } + set_if_addr(master_ifname, slave_ifname); } else { res = clear_if_addr(slave_ifname); if (res) { @@ -1085,7 +1079,6 @@ static int set_if_addr(char *master_ifname, char *slave_ifname) slave_ifname, ifra[i].req_name, strerror(saved_errno)); - return res; } ipaddr = ifr.ifr_addr.sa_data;