diff options
| author | Colin Cross <ccross@android.com> | 2013-11-07 13:19:34 -0800 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2016-02-16 13:51:20 -0800 |
| commit | c91e8c503c720f120b91b1f7dab504b92c373800 (patch) | |
| tree | d7961a074c91a9486f18c4559aa836d412c57bd6 /include/linux | |
| parent | 11a5343eebba995cb8cc73a965ef972512eabfcc (diff) | |
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>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/if_pppolac.h | 12 | ||||
| -rw-r--r-- | include/linux/if_pppopns.h | 11 |
2 files changed, 2 insertions, 21 deletions
diff --git a/include/linux/if_pppolac.h b/include/linux/if_pppolac.h index c06bd6c8ba26..e40aa1075a30 100644 --- a/include/linux/if_pppolac.h +++ b/include/linux/if_pppolac.h @@ -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 */ diff --git a/include/linux/if_pppopns.h b/include/linux/if_pppopns.h index 0cf34b4d551f..4ac621a9ce7c 100644 --- a/include/linux/if_pppopns.h +++ b/include/linux/if_pppopns.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 */ |