forked from Minki/linux
[NET]: Fix ifenslave to not fail on lack of IP information
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>
This commit is contained in:
parent
00cb277a4a
commit
e6d184e331
|
@ -693,13 +693,7 @@ static int enslave(char *master_ifname, char *slave_ifname)
|
||||||
/* Older bonding versions would panic if the slave has no IP
|
/* Older bonding versions would panic if the slave has no IP
|
||||||
* address, so get the IP setting from the master.
|
* address, so get the IP setting from the master.
|
||||||
*/
|
*/
|
||||||
res = set_if_addr(master_ifname, slave_ifname);
|
set_if_addr(master_ifname, slave_ifname);
|
||||||
if (res) {
|
|
||||||
fprintf(stderr,
|
|
||||||
"Slave '%s': Error: set address failed\n",
|
|
||||||
slave_ifname);
|
|
||||||
return res;
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
res = clear_if_addr(slave_ifname);
|
res = clear_if_addr(slave_ifname);
|
||||||
if (res) {
|
if (res) {
|
||||||
|
@ -1085,7 +1079,6 @@ static int set_if_addr(char *master_ifname, char *slave_ifname)
|
||||||
slave_ifname, ifra[i].req_name,
|
slave_ifname, ifra[i].req_name,
|
||||||
strerror(saved_errno));
|
strerror(saved_errno));
|
||||||
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ipaddr = ifr.ifr_addr.sa_data;
|
ipaddr = ifr.ifr_addr.sa_data;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user