X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=linux-2.6-524-peercred.patch;h=47a227fc3ad3be4fdb1613fc80a6de4c76ff22bd;hb=refs%2Fheads%2Ftrellis;hp=72b13467eca9a8e56234e2bd5ea15756974609af;hpb=cd34e6ae86ebb256dba40cfe89d9ebb5ca36e3c8;p=linux-2.6.git

diff --git a/linux-2.6-524-peercred.patch b/linux-2.6-524-peercred.patch
index 72b13467e..47a227fc3 100644
--- a/linux-2.6-524-peercred.patch
+++ b/linux-2.6-524-peercred.patch
@@ -1,20 +1,19 @@
-diff -Nurb linux-2.6.22-510/include/linux/socket.h linux-2.6.22-520/include/linux/socket.h
---- linux-2.6.22-510/include/linux/socket.h	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/include/linux/socket.h	2008-06-06 17:07:56.000000000 -0400
-@@ -288,6 +288,8 @@
- #define SOL_TIPC	271
- #define SOL_RXRPC	272
+diff -NurpP --exclude '*.orig' --exclude '*.rej' linux-2.6.27.10-vs2.3.x-PS-522-523/include/linux/socket.h linux-2.6.27.10-vs2.3.x-PS-522-523-524/include/linux/socket.h
+--- linux-2.6.27.10-vs2.3.x-PS-522-523/include/linux/socket.h	2008-10-13 14:52:09.000000000 +0200
++++ linux-2.6.27.10-vs2.3.x-PS-522-523-524/include/linux/socket.h	2009-01-21 03:34:57.000000000 +0100
+@@ -296,6 +296,8 @@ struct ucred {
+ #define SOL_PPPOL2TP	273
+ #define SOL_BLUETOOTH	274
  
 +#define SO_SETXID	SO_PEERCRED
 +
  /* IPX options */
  #define IPX_TYPE	1
  
-
-
---- linux-i686-2.6.22/net/core/sock.c.orig	2008-07-28 16:36:26.000000000 -0400
-+++ linux-i686-2.6.22/net/core/sock.c	2008-08-01 11:32:44.000000000 -0400
-@@ -455,6 +455,7 @@
+diff -NurpP --exclude '*.orig' --exclude '*.rej' linux-2.6.27.10-vs2.3.x-PS-522-523/net/core/sock.c linux-2.6.27.10-vs2.3.x-PS-522-523-524/net/core/sock.c
+--- linux-2.6.27.10-vs2.3.x-PS-522-523/net/core/sock.c	2009-01-21 03:27:01.000000000 +0100
++++ linux-2.6.27.10-vs2.3.x-PS-522-523-524/net/core/sock.c	2009-01-21 03:34:57.000000000 +0100
+@@ -526,6 +526,7 @@ set_sndbuf:
  		}
  		sk->sk_xid = val;
  		sk->sk_nid = val;