net: move PPPoLAC and PPPoPNS headers to uapi
Move the entire contents of the linux/if_pppolac.h and linux/if_pppopns.h headers to uapi, they only contain userspace interfaces. Change-Id: I3cfed7f2ae400b53269a1f59144aa3dbc30ae0b5 Signed-off-by: Colin Cross <ccross@android.com> Git-commit: 9efb6ab8798107e5500ea6d9a2221441c580e8cb Git-Repo: https://android.googlesource.com/kernel/common.git Signed-off-by: Ian Maund <imaund@codeaurora.org>
This commit is contained in:
parent
3781fb43d0
commit
fb7dde78d4
|
@ -18,16 +18,6 @@
|
|||
#ifndef __LINUX_IF_PPPOLAC_H
|
||||
#define __LINUX_IF_PPPOLAC_H
|
||||
|
||||
#include <linux/socket.h>
|
||||
#include <linux/types.h>
|
||||
|
||||
struct sockaddr_pppolac {
|
||||
sa_family_t sa_family; /* AF_PPPOX */
|
||||
unsigned int sa_protocol; /* PX_PROTO_OLAC */
|
||||
int udp_socket;
|
||||
struct __attribute__((packed)) {
|
||||
__u16 tunnel, session;
|
||||
} local, remote;
|
||||
} __attribute__((packed));
|
||||
#include <uapi/linux/if_pppolac.h>
|
||||
|
||||
#endif /* __LINUX_IF_PPPOLAC_H */
|
||||
|
|
|
@ -18,15 +18,6 @@
|
|||
#ifndef __LINUX_IF_PPPOPNS_H
|
||||
#define __LINUX_IF_PPPOPNS_H
|
||||
|
||||
#include <linux/socket.h>
|
||||
#include <linux/types.h>
|
||||
|
||||
struct sockaddr_pppopns {
|
||||
sa_family_t sa_family; /* AF_PPPOX */
|
||||
unsigned int sa_protocol; /* PX_PROTO_OPNS */
|
||||
int tcp_socket;
|
||||
__u16 local;
|
||||
__u16 remote;
|
||||
} __attribute__((packed));
|
||||
#include <uapi/linux/if_pppopns.h>
|
||||
|
||||
#endif /* __LINUX_IF_PPPOPNS_H */
|
||||
|
|
|
@ -0,0 +1,33 @@
|
|||
/* include/uapi/linux/if_pppolac.h
|
||||
*
|
||||
* Header for PPP on L2TP Access Concentrator / PPPoLAC Socket (RFC 2661)
|
||||
*
|
||||
* Copyright (C) 2009 Google, Inc.
|
||||
* Author: Chia-chi Yeh <chiachi@android.com>
|
||||
*
|
||||
* This software is licensed under the terms of the GNU General Public
|
||||
* License version 2, as published by the Free Software Foundation, and
|
||||
* may be copied, distributed, and modified under those terms.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
#ifndef _UAPI_LINUX_IF_PPPOLAC_H
|
||||
#define _UAPI_LINUX_IF_PPPOLAC_H
|
||||
|
||||
#include <linux/socket.h>
|
||||
#include <linux/types.h>
|
||||
|
||||
struct sockaddr_pppolac {
|
||||
sa_family_t sa_family; /* AF_PPPOX */
|
||||
unsigned int sa_protocol; /* PX_PROTO_OLAC */
|
||||
int udp_socket;
|
||||
struct __attribute__((packed)) {
|
||||
__u16 tunnel, session;
|
||||
} local, remote;
|
||||
} __attribute__((packed));
|
||||
|
||||
#endif /* _UAPI_LINUX_IF_PPPOLAC_H */
|
|
@ -0,0 +1,32 @@
|
|||
/* include/uapi/linux/if_pppopns.h
|
||||
*
|
||||
* Header for PPP on PPTP Network Server / PPPoPNS Socket (RFC 2637)
|
||||
*
|
||||
* Copyright (C) 2009 Google, Inc.
|
||||
* Author: Chia-chi Yeh <chiachi@android.com>
|
||||
*
|
||||
* This software is licensed under the terms of the GNU General Public
|
||||
* License version 2, as published by the Free Software Foundation, and
|
||||
* may be copied, distributed, and modified under those terms.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
#ifndef _UAPI_LINUX_IF_PPPOPNS_H
|
||||
#define _UAPI_LINUX_IF_PPPOPNS_H
|
||||
|
||||
#include <linux/socket.h>
|
||||
#include <linux/types.h>
|
||||
|
||||
struct sockaddr_pppopns {
|
||||
sa_family_t sa_family; /* AF_PPPOX */
|
||||
unsigned int sa_protocol; /* PX_PROTO_OPNS */
|
||||
int tcp_socket;
|
||||
__u16 local;
|
||||
__u16 remote;
|
||||
} __attribute__((packed));
|
||||
|
||||
#endif /* _UAPI_LINUX_IF_PPPOPNS_H */
|
Loading…
Reference in New Issue