Date: Mon, 21 Sep 2015 18:32:44 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r288072 - stable/10/sys/net Message-ID: <201509211832.t8LIWiSA060821@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Mon Sep 21 18:32:43 2015 New Revision: 288072 URL: https://svnweb.freebsd.org/changeset/base/288072 Log: Fix a panic in SIOCSLAGG and SIOCGLAGGOPTS. This was caused by a wrongly-MFC'd patch in r287723. Pointy hat to: hrs Modified: stable/10/sys/net/if_lagg.c Modified: stable/10/sys/net/if_lagg.c ============================================================================== --- stable/10/sys/net/if_lagg.c Mon Sep 21 17:31:11 2015 (r288071) +++ stable/10/sys/net/if_lagg.c Mon Sep 21 18:32:43 2015 (r288072) @@ -1063,7 +1063,8 @@ lagg_ioctl(struct ifnet *ifp, u_long cmd 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 break; } } - proto->ti_attach(sc); - LAGG_WLOCK(sc); - sc->sc_proto = proto->ti_proto; LAGG_WUNLOCK(sc); break; case SIOCGLAGGFLAGS:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509211832.t8LIWiSA060821>