Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1db9c401 authored by Colin Cross's avatar Colin Cross Committed by Amit Pundir
Browse files

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: default avatarColin Cross <ccross@android.com>
parent 11293cb1

include/linux/if_pppolac.h

+1 −11
Original line number Diff line number Diff line
@@ -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 */

include/linux/if_pppopns.h

+1 −10
Original line number Diff line number Diff line
@@ -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 */

include/uapi/linux/if_pppolac.h

0 → 100644
+33 −0
Original line number Diff line number Diff line 
/* 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 */

include/uapi/linux/if_pppopns.h

0 → 100644
+32 −0
Original line number Diff line number Diff line 
/* 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 */