[openib-general] [PATCH][Take2] Change AF_INET_SDP to 27

[Libor Michalek]

On Thu, Feb 10, 2005 at 08:01:01PM -0800, Tom Duffy wrote:
> Oops.  I only changed it one place.  Why is it defined in two places?
> 

  You're right, it doesn't need to be in two places. I'll delete
sdp_inet.h since it's redundant, plus make the AF_INET_SDP change.
Here's the patch.

-Libor

Index: sdp_main.h
===================================================================
--- sdp_main.h	(revision 1778)
+++ sdp_main.h	(working copy)
@@ -92,7 +92,6 @@
 #include <ib_cache.h>
 #include <ib_cm.h>
 #include "sdp_sock.h"
-#include "sdp_inet.h"
 /*
  * sdp local includes
  */
Index: sdp_inet.h
===================================================================
--- sdp_inet.h	(revision 1778)
+++ sdp_inet.h	(working copy)
@@ -1,33 +0,0 @@
-/*
-  This software is available to you under a choice of one of two
-  licenses.  You may choose to be licensed under the terms of the GNU
-  General Public License (GPL) Version 2, available at
-  <http://www.fsf.org/copyleft/gpl.html>, or the OpenIB.org BSD
-  license, available in the LICENSE.TXT file accompanying this
-  software.  These details are also available at
-  <http://openib.org/license.html>.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  SOFTWARE.
-
-  Copyright (c) 2005 Topspin Communications.  All rights reserved.
-
-  $Id: sdp_inet.h 140 2004-05-11 00:30:52Z libor $
-*/
-
-#ifndef _SDP_INET_H
-#define _SDP_INET_H
-
-/*
- * constants shared between user and kernel space.
- */
-#define AF_INET_SDP 26		/* SDP socket protocol family */
-#define AF_INET_STR "AF_INET_SDP"	/* SDP enabled environment variable */
-
-#endif /* _SDP_INET_H */
Index: sdp_sock.h
===================================================================
--- sdp_sock.h	(revision 1778)
+++ sdp_sock.h	(working copy)
@@ -28,8 +28,9 @@
  * functions (e.g bind, connect, etc.) Either AF_INET or AF_INET_SDP can
  * be used with a SDP socket.
  */
-#define AF_INET_SDP   26
-#define PF_INET_SDP   AF_INET_SDP
+#define AF_INET_SDP  27
+#define PF_INET_SDP  AF_INET_SDP
+#define AF_INET_STR "AF_INET_SDP" /* SDP enabled environment variable */
 /*
  * Socket option level for SDP specific parameters.
  */
Index: sdp_dev.h
===================================================================
--- sdp_dev.h	(revision 1778)
+++ sdp_dev.h	(working copy)
@@ -36,7 +36,6 @@
  * sdp types
  */
 #include <ib_verbs.h>
-#include "sdp_inet.h"
 #include "sdp_msgs.h"
 
 #define SDP_MSG_HDR_REQ_SIZE 0x10 /* required header size (BSDH) */