Re: resend [PATCH 2/5 2.6.21] L2TP: Changes to existing ppp and socket kernel headers for L2TP
From: David Miller <davem@davemloft.net>
Date: 2007-06-27 07:18:05
From: James Chapman <jchapman@katalix.com> Date: Sat, 26 May 2007 18:47:24 +0100
Add struct sockaddr_pppol2tp to carry L2TP-specific address information for the PPPoX (PPPoL2TP) socket. Unfortunately we can't use the union inside struct sockaddr_pppox because the L2TP-specific data is larger than the current size of the union and we must preserve the size of struct sockaddr_pppox for binary compatibility. Also add a PPPIOCGL2TPSTATS ioctl to allow userspace to obtain L2TP counters and state from the kernel. Signed-off-by: James Chapman <jchapman@katalix.com>
This looks OK, patch applied to net-2.6.23, thanks.
quoted hunk ↗ jump to hunk
Index: linux-2.6.21/include/linux/socket.h ===================================================================--- linux-2.6.21.orig/include/linux/socket.h +++ linux-2.6.21/include/linux/socket.h@@ -284,6 +284,7 @@ struct ucred { #define SOL_DCCP 269 #define SOL_NETLINK 270 #define SOL_TIPC 271 +#define SOL_PPPOL2TP 272
RXRPC has already taken value 272 so I changed this to use the next available value, 273.