Commit 544c8bb7 authored by Erik Habbinga's avatar Erik Habbinga Committed by Jeff Garzik

ifenslave sample program updates:

* ifr2.ifr_flags was not initialized in the hwaddr_notset case,
* SIOCGIFFLAGS now called before hwaddr_notset test
parent 3eb31917
......@@ -38,6 +38,9 @@
* take care of this itself
* - Try the SIOC*** versions of the bonding ioctls before using the
* old versions
* - 2002/02/18 Erik Habbinga <erik_habbinga @ hp dot com> :
* - ifr2.ifr_flags was not initialized in the hwaddr_notset case,
* SIOCGIFFLAGS now called before hwaddr_notset test
*/
static char *version =
......@@ -289,10 +292,6 @@ main(int argc, char **argv)
- if !hwaddr_notset, assign the master's hwaddr to each slave
*/
if (hwaddr_notset) { /* we do nothing */
}
else { /* we'll assign master's hwaddr to this slave */
strncpy(ifr2.ifr_name, slave_ifname, IFNAMSIZ);
if (ioctl(skfd, SIOCGIFFLAGS, &ifr2) < 0) {
int saved_errno = errno;
......@@ -301,6 +300,10 @@ main(int argc, char **argv)
return 1;
}
if (hwaddr_notset) { /* we do nothing */
}
else { /* we'll assign master's hwaddr to this slave */
if (ifr2.ifr_flags & IFF_UP) {
ifr2.ifr_flags &= ~IFF_UP;
if (ioctl(skfd, SIOCSIFFLAGS, &ifr2) < 0) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment