Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 14635
b: refs/heads/master
c: e6d184e
h: refs/heads/master
i:
  14633: ca34438
  14631: a9944c6
v: v3
  • Loading branch information
Neil Horman authored and David S. Miller committed Nov 22, 2005
1 parent d547858 commit bcfb347
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 00cb277a4a1fb76aafb2fb28aa99f30546e619c5
refs/heads/master: e6d184e33109010412ad1d59719af74755a935f4
9 changes: 1 addition & 8 deletions trunk/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 bcfb347

Please sign in to comment.