From 40818e60abd56b547dcb899b6da4fde0e0fe7eea Mon Sep 17 00:00:00 2001 From: hrs Date: Mon, 21 Sep 2015 18:32:43 +0000 Subject: [PATCH] Fix a panic in SIOCSLAGG and SIOCGLAGGOPTS. This was caused by a wrongly-MFC'd patch in r287723. Pointy hat to: hrs git-svn-id: svn://svn.freebsd.org/base/stable/10@288072 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/net/if_lagg.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index a690794e3..c77f244e7 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: -- 2.45.0