From c41092dd4c49267f232f6cba3d31c6c68bfdf68d Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Sun, 20 May 2012 16:48:17 +1000 Subject: [PATCH] Remove old version of Linux if_pppol2tp.h This has been in the Linux kernel source now for long enough that we can rely on getting a usable version from /usr/include on all distributions that we care about. The version we have here had started to lag behind what is in the Linux kernel, causing compilation errors due to struct pppol2tpv3_addr being undefined. Removing our local version means we will use what is in /usr/include instead. Signed-off-by: Paul Mackerras --- include/linux/if_pppol2tp.h | 65 ------------------------------------- 1 file changed, 65 deletions(-) delete mode 100644 include/linux/if_pppol2tp.h diff --git a/include/linux/if_pppol2tp.h b/include/linux/if_pppol2tp.h deleted file mode 100644 index 4113d6a..0000000 --- a/include/linux/if_pppol2tp.h +++ /dev/null @@ -1,65 +0,0 @@ -/*************************************************************************** - * Linux PPP over L2TP (PPPoL2TP) Socket Implementation (RFC 2661) - * - * This file supplies definitions required by the PPP over L2TP driver - * (pppol2tp.c). All version information wrt this file is located in pppol2tp.c - * - * License: - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. - * - */ - -#ifndef __LINUX_IF_PPPOL2TP_H -#define __LINUX_IF_PPPOL2TP_H - -#include - -/* Structure used to connect() the socket to a particular tunnel UDP - * socket. - */ -struct pppol2tp_addr -{ - pid_t pid; /* pid that owns the fd. - * 0 => current */ - int fd; /* FD of UDP socket to use */ - - struct sockaddr_in addr; /* IP address and port to send to */ - - __u16 s_tunnel, s_session; /* For matching incoming packets */ - __u16 d_tunnel, d_session; /* For sending outgoing packets */ -}; - -/* Socket options: - * DEBUG - bitmask of debug message categories - * SENDSEQ - 0 => don't send packets with sequence numbers - * 1 => send packets with sequence numbers - * RECVSEQ - 0 => receive packet sequence numbers are optional - * 1 => drop receive packets without sequence numbers - * LNSMODE - 0 => act as LAC. - * 1 => act as LNS. - * REORDERTO - reorder timeout (in millisecs). If 0, don't try to reorder. - */ -enum { - PPPOL2TP_SO_DEBUG = 1, - PPPOL2TP_SO_RECVSEQ = 2, - PPPOL2TP_SO_SENDSEQ = 3, - PPPOL2TP_SO_LNSMODE = 4, - PPPOL2TP_SO_REORDERTO = 5, -}; - -/* Debug message categories for the DEBUG socket option */ -enum { - PPPOL2TP_MSG_DEBUG = (1 << 0), /* verbose debug (if - * compiled in) */ - PPPOL2TP_MSG_CONTROL = (1 << 1), /* userspace - kernel - * interface */ - PPPOL2TP_MSG_SEQ = (1 << 2), /* sequence numbers */ - PPPOL2TP_MSG_DATA = (1 << 3), /* data packets */ -}; - - - -#endif -- 2.39.2