Patchwork [net-next] Remove leftover #endif after introducing SO_REUSEPORT

login
register
mail settings
Submitter Thomas Graf
Date Jan. 25, 2013, 10 a.m.
Message ID <20130125100058.GJ11342@casper.infradead.org>
Download mbox | patch
Permalink /patch/215608/
State Accepted
Delegated to: David Miller
Headers show

Comments

Thomas Graf - Jan. 25, 2013, 10 a.m.
Commit 055dc21a1d (soreuseport: infrastructure) removed the #if 0
around SO_REUSEPORT without removing the corresponding #endif
thus causing the header guard to close early.

Cc: Tom Herbert <therbert@google.com>
Signed-off-by: Thomas Graf <tgraf@suug.ch>
---
 arch/mips/include/uapi/asm/socket.h | 1 -
 1 file changed, 1 deletion(-)

--
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
David Miller - Jan. 27, 2013, 6:01 a.m.
From: Thomas Graf <tgraf@suug.ch>
Date: Fri, 25 Jan 2013 10:00:58 +0000

> Commit 055dc21a1d (soreuseport: infrastructure) removed the #if 0
> around SO_REUSEPORT without removing the corresponding #endif
> thus causing the header guard to close early.
> 
> Cc: Tom Herbert <therbert@google.com>
> Signed-off-by: Thomas Graf <tgraf@suug.ch>

Applied.
--
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

Patch

diff --git a/arch/mips/include/uapi/asm/socket.h b/arch/mips/include/uapi/asm/socket.h
index 7e27236..3e68bfb 100644
--- a/arch/mips/include/uapi/asm/socket.h
+++ b/arch/mips/include/uapi/asm/socket.h
@@ -29,7 +29,6 @@ 
 				   socket to transmit pending data.  */
 #define SO_OOBINLINE 0x0100	/* Receive out-of-band data in-band.  */
 #define SO_REUSEPORT 0x0200	/* Allow local address and port reuse.  */
-#endif
 
 #define SO_TYPE		0x1008	/* Compatible name for SO_STYLE.  */
 #define SO_STYLE	SO_TYPE	/* Synonym */