[rds-commits] zab commits r82 - trunk/2.6-kernel-patches
svn-commits@oss.oracle.com
svn-commits at oss.oracle.com
Tue May 30 13:14:33 CDT 2006
Author: zab
Date: 2006-05-30 13:14:32 -0500 (Tue, 30 May 2006)
New Revision: 82
Added:
trunk/2.6-kernel-patches/add-rds-defines.patch
Removed:
trunk/2.6-kernel-patches/add-net-rds-config-build.patch
trunk/2.6-kernel-patches/add-pf-rds.patch
Log:
- add the current 2.6 patch and remove the old ones
Deleted: trunk/2.6-kernel-patches/add-net-rds-config-build.patch
===================================================================
--- trunk/2.6-kernel-patches/add-net-rds-config-build.patch 2006-05-30 18:12:57 UTC (rev 81)
+++ trunk/2.6-kernel-patches/add-net-rds-config-build.patch 2006-05-30 18:14:32 UTC (rev 82)
@@ -1,44 +0,0 @@
-Index: 2.6.15-rc5-mm2-pf-rds/net/Kconfig
-===================================================================
---- 2.6.15-rc5-mm2-pf-rds.orig/net/Kconfig 2005-12-12 10:51:11.000000000 -0800
-+++ 2.6.15-rc5-mm2-pf-rds/net/Kconfig 2005-12-12 10:56:10.000000000 -0800
-@@ -159,6 +159,7 @@
- source "drivers/net/appletalk/Kconfig"
- source "net/x25/Kconfig"
- source "net/lapb/Kconfig"
-+source "net/rds/Kconfig"
-
- config NET_DIVERT
- bool "Frame Diverter (EXPERIMENTAL)"
-Index: 2.6.15-rc5-mm2-pf-rds/net/Makefile
-===================================================================
---- 2.6.15-rc5-mm2-pf-rds.orig/net/Makefile 2005-12-12 10:52:00.000000000 -0800
-+++ 2.6.15-rc5-mm2-pf-rds/net/Makefile 2005-12-12 10:56:10.000000000 -0800
-@@ -36,6 +36,7 @@
- obj-$(CONFIG_AX25) += ax25/
- obj-$(CONFIG_IRDA) += irda/
- obj-$(CONFIG_BT) += bluetooth/
-+obj-$(CONFIG_RDS) += rds/
- obj-$(CONFIG_SUNRPC) += sunrpc/
- obj-$(CONFIG_RXRPC) += rxrpc/
- obj-$(CONFIG_ATM) += atm/
-Index: 2.6.15-rc5-mm2-pf-rds/net/rds/Kconfig
-===================================================================
---- 2.6.15-rc5-mm2-pf-rds.orig/net/rds/Kconfig 2004-02-23 13:02:56.000000000 -0800
-+++ 2.6.15-rc5-mm2-pf-rds/net/rds/Kconfig 2005-12-12 10:56:10.000000000 -0800
-@@ -0,0 +1,6 @@
-+
-+config RDS
-+ tristate "Reliable Datagram Sockets (RDS) (EXPERIMENTAL)"
-+ depends on EXPERIMENTAL
-+ ---help---
-+ put some help text here
-Index: 2.6.15-rc5-mm2-pf-rds/net/rds/Makefile
-===================================================================
---- 2.6.15-rc5-mm2-pf-rds.orig/net/rds/Makefile 2004-02-23 13:02:56.000000000 -0800
-+++ 2.6.15-rc5-mm2-pf-rds/net/rds/Makefile 2005-12-16 10:02:10.461853213 -0800
-@@ -0,0 +1,4 @@
-+obj-$(CONFIG_RDS) += rds.o
-+
-+rds-y := af_rds.o eth_rx.o eth_tx.o eth_stream.o eth_peer.o \
-+ eth_stats.o
Deleted: trunk/2.6-kernel-patches/add-pf-rds.patch
===================================================================
--- trunk/2.6-kernel-patches/add-pf-rds.patch 2006-05-30 18:12:57 UTC (rev 81)
+++ trunk/2.6-kernel-patches/add-pf-rds.patch 2006-05-30 18:14:32 UTC (rev 82)
@@ -1,59 +0,0 @@
-
-Add the various defines needed to support RDS/eth. The ethernet protocol ID
-still needs to be officially registered with IANA (or whomever..).
-
-Index: 2.6.16-rc5-mm3-pf-rds/include/linux/if_ether.h
-===================================================================
---- 2.6.16-rc5-mm3-pf-rds.orig/include/linux/if_ether.h 2006-03-09 15:59:46.792639774 -0800
-+++ 2.6.16-rc5-mm3-pf-rds/include/linux/if_ether.h 2006-03-09 16:15:47.776320070 -0800
-@@ -74,6 +74,7 @@
- */
- #define ETH_P_AOE 0x88A2 /* ATA over Ethernet */
- #define ETH_P_TIPC 0x88CA /* TIPC */
-+#define ETH_P_RDS 0x2DE5 /* RDS (tmp ID, talking with iana) */
-
- /*
- * Non DIX types. Won't clash for 1500 types.
-Index: 2.6.16-rc5-mm3-pf-rds/include/linux/net.h
-===================================================================
---- 2.6.16-rc5-mm3-pf-rds.orig/include/linux/net.h 2006-03-09 15:59:47.170526005 -0800
-+++ 2.6.16-rc5-mm3-pf-rds/include/linux/net.h 2006-03-09 16:04:42.303671391 -0800
-@@ -26,7 +26,7 @@
- struct poll_table_struct;
- struct inode;
-
--#define NPROTO 32 /* should be enough for now.. */
-+#define NPROTO 33 /* should be enough for now.. */
-
- #define SYS_SOCKET 1 /* sys_socket(2) */
- #define SYS_BIND 2 /* sys_bind(2) */
-Index: 2.6.16-rc5-mm3-pf-rds/include/linux/socket.h
-===================================================================
---- 2.6.16-rc5-mm3-pf-rds.orig/include/linux/socket.h 2006-03-09 15:59:11.514260901 -0800
-+++ 2.6.16-rc5-mm3-pf-rds/include/linux/socket.h 2006-03-09 16:19:31.544950898 -0800
-@@ -188,7 +188,8 @@
- #define AF_LLC 26 /* Linux LLC */
- #define AF_TIPC 30 /* TIPC sockets */
- #define AF_BLUETOOTH 31 /* Bluetooth sockets */
--#define AF_MAX 32 /* For now.. */
-+#define AF_RDS 32 /* Reliable Datagram Socket */
-+#define AF_MAX 33 /* For now.. */
-
- /* Protocol families, same as address families. */
- #define PF_UNSPEC AF_UNSPEC
-@@ -221,6 +222,7 @@
- #define PF_LLC AF_LLC
- #define PF_TIPC AF_TIPC
- #define PF_BLUETOOTH AF_BLUETOOTH
-+#define PF_RDS AF_RDS
- #define PF_MAX AF_MAX
-
- /* Maximum queue length specifiable by listen. */
-@@ -282,6 +284,7 @@
- #define SOL_DCCP 269
- #define SOL_NETLINK 270
- #define SOL_TIPC 271
-+#define SOL_RDS 272
-
- /* IPX options */
- #define IPX_TYPE 1
Added: trunk/2.6-kernel-patches/add-rds-defines.patch
===================================================================
--- trunk/2.6-kernel-patches/add-rds-defines.patch 2006-05-30 18:12:57 UTC (rev 81)
+++ trunk/2.6-kernel-patches/add-rds-defines.patch 2006-05-30 18:14:32 UTC (rev 82)
@@ -0,0 +1,46 @@
+
+Add the various defines needed to support RDS.
+
+Index: 2.6.17-rc3-mm1-rds/include/linux/net.h
+===================================================================
+--- 2.6.17-rc3-mm1-rds.orig/include/linux/net.h
++++ 2.6.17-rc3-mm1-rds/include/linux/net.h
+@@ -26,7 +26,7 @@
+ struct poll_table_struct;
+ struct inode;
+
+-#define NPROTO 32 /* should be enough for now.. */
++#define NPROTO 33 /* should be enough for now.. */
+
+ #define SYS_SOCKET 1 /* sys_socket(2) */
+ #define SYS_BIND 2 /* sys_bind(2) */
+Index: 2.6.17-rc3-mm1-rds/include/linux/socket.h
+===================================================================
+--- 2.6.17-rc3-mm1-rds.orig/include/linux/socket.h
++++ 2.6.17-rc3-mm1-rds/include/linux/socket.h
+@@ -189,7 +189,8 @@ struct ucred {
+ #define AF_LLC 26 /* Linux LLC */
+ #define AF_TIPC 30 /* TIPC sockets */
+ #define AF_BLUETOOTH 31 /* Bluetooth sockets */
+-#define AF_MAX 32 /* For now.. */
++#define AF_RDS 32 /* Reliable Datagram Socket */
++#define AF_MAX 33 /* For now.. */
+
+ /* Protocol families, same as address families. */
+ #define PF_UNSPEC AF_UNSPEC
+@@ -222,6 +223,7 @@ struct ucred {
+ #define PF_LLC AF_LLC
+ #define PF_TIPC AF_TIPC
+ #define PF_BLUETOOTH AF_BLUETOOTH
++#define PF_RDS AF_RDS
+ #define PF_MAX AF_MAX
+
+ /* Maximum queue length specifiable by listen. */
+@@ -283,6 +285,7 @@ struct ucred {
+ #define SOL_DCCP 269
+ #define SOL_NETLINK 270
+ #define SOL_TIPC 271
++#define SOL_RDS 272
+
+ /* IPX options */
+ #define IPX_TYPE 1
More information about the rds-commits
mailing list