diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-01-09 14:47:04 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-01-10 11:03:27 +0100 |
| commit | 0577772720a4ecb050a230f75346f90b246e93c8 (patch) | |
| tree | a3fba8bb57e77c932e08dd0d4bbe49adb6312e5e /freebsd/sys/net/if.c | |
| parent | Update to FreeBSD head 2016-12-10 (diff) | |
| download | rtems-libbsd-0577772720a4ecb050a230f75346f90b246e93c8.tar.bz2 | |
Update to FreeBSD head 2017-01-09
Git mirror commit 1f8e4a995a6ede4bdb24e6d335ccda2bdb0175ab.
Diffstat (limited to 'freebsd/sys/net/if.c')
| -rw-r--r-- | freebsd/sys/net/if.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/freebsd/sys/net/if.c b/freebsd/sys/net/if.c index e1c525bd..882eee5c 100644 --- a/freebsd/sys/net/if.c +++ b/freebsd/sys/net/if.c @@ -2302,7 +2302,7 @@ static int ifhwioctl(u_long cmd, struct ifnet *ifp, caddr_t data, struct thread *td) { struct ifreq *ifr; - int error = 0; + int error = 0, do_ifup = 0; int new_flags, temp_flags; size_t namelen, onamelen; size_t descrlen; @@ -2429,7 +2429,7 @@ ifhwioctl(u_long cmd, struct ifnet *ifp, caddr_t data, struct thread *td) if_down(ifp); } else if (new_flags & IFF_UP && (ifp->if_flags & IFF_UP) == 0) { - if_up(ifp); + do_ifup = 1; } /* See if permanently promiscuous mode bit is about to flip */ if ((ifp->if_flags ^ new_flags) & IFF_PPROMISC) { @@ -2448,6 +2448,8 @@ ifhwioctl(u_long cmd, struct ifnet *ifp, caddr_t data, struct thread *td) if (ifp->if_ioctl) { (void) (*ifp->if_ioctl)(ifp, cmd, data); } + if (do_ifup) + if_up(ifp); getmicrotime(&ifp->if_lastchange); break; |