diff options
author | Neil Horman <nhorman@tuxdriver.com> | 2005-11-22 17:56:32 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2005-11-22 17:56:32 -0500 |
commit | e6d184e33109010412ad1d59719af74755a935f4 (patch) | |
tree | 50875ca890857b39e8ea4b8521069793d75f0252 /Documentation/networking/ifenslave.c | |
parent | 00cb277a4a1fb76aafb2fb28aa99f30546e619c5 (diff) |
[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>
Diffstat (limited to 'Documentation/networking/ifenslave.c')
-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) | |||
693 | /* Older bonding versions would panic if the slave has no IP | 693 | /* Older bonding versions would panic if the slave has no IP |
694 | * address, so get the IP setting from the master. | 694 | * address, so get the IP setting from the master. |
695 | */ | 695 | */ |
696 | res = set_if_addr(master_ifname, slave_ifname); | 696 | set_if_addr(master_ifname, slave_ifname); |
697 | if (res) { | ||
698 | fprintf(stderr, | ||
699 | "Slave '%s': Error: set address failed\n", | ||
700 | slave_ifname); | ||
701 | return res; | ||
702 | } | ||
703 | } else { | 697 | } else { |
704 | res = clear_if_addr(slave_ifname); | 698 | res = clear_if_addr(slave_ifname); |
705 | if (res) { | 699 | if (res) { |
@@ -1085,7 +1079,6 @@ static int set_if_addr(char *master_ifname, char *slave_ifname) | |||
1085 | slave_ifname, ifra[i].req_name, | 1079 | slave_ifname, ifra[i].req_name, |
1086 | strerror(saved_errno)); | 1080 | strerror(saved_errno)); |
1087 | 1081 | ||
1088 | return res; | ||
1089 | } | 1082 | } |
1090 | 1083 | ||
1091 | ipaddr = ifr.ifr_addr.sa_data; | 1084 | ipaddr = ifr.ifr_addr.sa_data; |