diff options
| author | hrs <hrs@FreeBSD.org> | 2015-09-21 18:32:43 +0000 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2015-09-21 18:32:43 +0000 |
| commit | d91e3630bbbd2abb94422dfd294a62526d4f7d63 (patch) | |
| tree | e9be8870d311d61ea53cc5a54746479e6f0cf500 /sys/net | |
| parent | 2fa97c28915a119ae01504fff8721b93f82a5107 (diff) | |
| download | FreeBSD-src-d91e3630bbbd2abb94422dfd294a62526d4f7d63.zip FreeBSD-src-d91e3630bbbd2abb94422dfd294a62526d4f7d63.tar.gz | |
Fix a panic in SIOCSLAGG and SIOCGLAGGOPTS. This was caused by a
wrongly-MFC'd patch in r287723.
Pointy hat to: hrs
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if_lagg.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index a690794..c77f244 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -1063,7 +1063,8 @@ lagg_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) sc->sc_detach(sc); else LAGG_WUNLOCK(sc); - } + } else + LAGG_WUNLOCK(sc); proto->ti_attach(sc); LAGG_WLOCK(sc); sc->sc_proto = proto->ti_proto; @@ -1187,9 +1188,6 @@ lagg_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) break; } } - proto->ti_attach(sc); - LAGG_WLOCK(sc); - sc->sc_proto = proto->ti_proto; LAGG_WUNLOCK(sc); break; case SIOCGLAGGFLAGS: |
