From patchwork Fri Jan 25 10:00:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Graf X-Patchwork-Id: 215608 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 361A62C008C for ; Fri, 25 Jan 2013 21:01:09 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755926Ab3AYKBF (ORCPT ); Fri, 25 Jan 2013 05:01:05 -0500 Received: from casper.infradead.org ([85.118.1.10]:43109 "EHLO casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755924Ab3AYKBD (ORCPT ); Fri, 25 Jan 2013 05:01:03 -0500 Received: from tgr by casper.infradead.org with local (Exim 4.76 #1 (Red Hat Linux)) id 1Tyg5i-0000Xb-PX; Fri, 25 Jan 2013 10:00:58 +0000 Date: Fri, 25 Jan 2013 10:00:58 +0000 From: Thomas Graf To: davem@davemloft.net Cc: netdev@vger.kernel.org, therbert@google.com Subject: [PATCH net-next] Remove leftover #endif after introducing SO_REUSEPORT Message-ID: <20130125100058.GJ11342@casper.infradead.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org See http://www.infradead.org/rpr.html Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Signed-off-by: Thomas Graf --- 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 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 */