Skip to content

Commit

Permalink
[NET]: Fix ifenslave to not fail on lack of IP information
Browse files Browse the repository at this point in the history
Patch to ifenslave so that under older ABI versions, a failure to propogate ip
information from master to slave does not result in a filure to enslave the
slave device.

Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Neil Horman authored and David S. Miller committed Nov 22, 2005
1 parent 00cb277 commit e6d184e
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions Documentation/networking/ifenslave.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit e6d184e

Please sign in to comment.