diff options
| author | Neil Horman <nhorman@tuxdriver.com> | 2005-11-22 14:56:32 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-11-22 14:56:32 -0800 |
| commit | e6d184e33109010412ad1d59719af74755a935f4 (patch) | |
| tree | 50875ca890857b39e8ea4b8521069793d75f0252 | |
| parent | 00cb277a4a1fb76aafb2fb28aa99f30546e619c5 (diff) | |
| download | linux-e6d184e33109010412ad1d59719af74755a935f4.tar.gz linux-e6d184e33109010412ad1d59719af74755a935f4.tar.bz2 linux-e6d184e33109010412ad1d59719af74755a935f4.zip | |
[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>
| -rw-r--r-- | Documentation/networking/ifenslave.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/Documentation/networking/ifenslave.c b/Documentation/networking/ifenslave.c index f315d20d3867..545447ac503a 100644 --- a/Documentation/networking/ifenslave.c +++ b/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; |