| Message ID | 20120207183911.4dd65ac8@destiny.ordissimo |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Anisse Astier <anisse@astier.eu> Date: Tue, 7 Feb 2012 18:39:11 +0100 > On Tue, 07 Feb 2012 12:29:31 -0500 (EST), David Miller <davem@davemloft.net> wrote : > >> From: Pavel Emelyanov <xemul@parallels.com> >> Date: Tue, 07 Feb 2012 17:37:51 +0400 >> >> > @@ -409,7 +409,7 @@ config INET_TCP_DIAG >> > >> > config INET_UDP_DIAG >> > tristate "UDP: socket monitoring interface" >> > - depends on INET_DIAG >> > + depends on INET_DIAG && IPV6 >> >> This needs to be something like "INET_DIAG && (IPV6 || IPV6=n)" > > Yes, this works better. This is the right solution. > > Tested-by: Anisse Astier <anisse@astier.eu> The patch was corrupted by your email client, it turned all the tab characters into spaces, you also didn't write an appropriate commit message. I took care of this, but if you plan to submit any patch at all in the future, even as an "request for comments" and testing, you must keep these issues in mind. -- 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
On Tue, Feb 7, 2012 at 7:36 PM, David Miller <davem@davemloft.net> wrote: > From: Anisse Astier <anisse@astier.eu> > Date: Tue, 7 Feb 2012 18:39:11 +0100 > >> On Tue, 07 Feb 2012 12:29:31 -0500 (EST), David Miller <davem@davemloft.net> wrote : >> >>> From: Pavel Emelyanov <xemul@parallels.com> >>> Date: Tue, 07 Feb 2012 17:37:51 +0400 >>> >>> > @@ -409,7 +409,7 @@ config INET_TCP_DIAG >>> > >>> > config INET_UDP_DIAG >>> > tristate "UDP: socket monitoring interface" >>> > - depends on INET_DIAG >>> > + depends on INET_DIAG && IPV6 >>> >>> This needs to be something like "INET_DIAG && (IPV6 || IPV6=n)" >> >> Yes, this works better. This is the right solution. >> >> Tested-by: Anisse Astier <anisse@astier.eu> > > The patch was corrupted by your email client, it turned all the > tab characters into spaces, you also didn't write an appropriate > commit message. > > I took care of this, but if you plan to submit any patch at all in > the future, even as an "request for comments" and testing, you must > keep these issues in mind. Sorry, I didn't expect anyone to use this as a patch (no sign-off, etc), so I shouldn't have posted a diff. -- 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/ipv4/Kconfig b/net/ipv4/Kconfig index aa2a2c7..d183262 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig @@ -409,7 +409,7 @@ config INET_TCP_DIAG config INET_UDP_DIAG tristate "UDP: socket monitoring interface" - depends on INET_DIAG + depends on INET_DIAG && (IPV6 || IPV6=n) default n ---help--- Support for UDP socket monitoring interface used by the ss tool.