Message ID | 1236727393.7958.38.camel@Maple |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
John Dykstra wrote: > ipv6: Fix BUG when disabled ipv6 module is unloaded > > Do not try to "uninitialize" ipv6 if its initialization had been skipped > because module parameter disable=1 had been specified. > > Reported-by: Thomas Backlund <tmb@mandriva.org> > Signed-off-by: John Dykstra <john.dykstra1@gmail.com> > --- > net/ipv6/af_inet6.c | 3 +++ > 1 files changed, 3 insertions(+), 0 deletions(-) > > diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c > index da944ec..a0f1798 100644 > --- a/net/ipv6/af_inet6.c > +++ b/net/ipv6/af_inet6.c > @@ -1192,6 +1192,9 @@ module_init(inet6_init); > > static void __exit inet6_exit(void) > { > + if (disable_ipv6) > + return; > + > /* First of all disallow new sockets creation. */ > sock_unregister(PF_INET6); > /* Disallow any further netlink messages */ Acked-by: Brian Haley <brian.haley@hp.com> Thanks for fixing this John. Sorry, this was in the original patch I tested here, but somehow didn't make it into what I sent to Dave. -Brian -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: John Dykstra <john.dykstra1@gmail.com> Date: Tue, 10 Mar 2009 23:23:13 +0000 > ipv6: Fix BUG when disabled ipv6 module is unloaded > > Do not try to "uninitialize" ipv6 if its initialization had been skipped > because module parameter disable=1 had been specified. > > Reported-by: Thomas Backlund <tmb@mandriva.org> > Signed-off-by: John Dykstra <john.dykstra1@gmail.com> I'm going to apply this by hand. But if you are going to submit patches in the future you have to fix the corruptions and mangling that your email client does to them. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index da944ec..a0f1798 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@ -1192,6 +1192,9 @@ module_init(inet6_init); static void __exit inet6_exit(void) { + if (disable_ipv6) + return; + /* First of all disallow new sockets creation. */ sock_unregister(PF_INET6); /* Disallow any further netlink messages */