* remotes/msm-4.9/tmp-39dae59:
Linux 4.14-rc8
x86/module: Detect and skip invalid relocations
objtool: Prevent GCC from merging annotate_unreachable(), take 2
Revert "x86/mm: Stop calling leave_mm() in idle code"
Documentation: Add Frank Rowand to list of enforcement statement endorsers
doc: add Willy Tarreau to the list of enforcement statement endorsers
tools/headers: Synchronize kernel ABI headers
objtool: Resync objtool's instruction decoder source code copy with the kernel's latest version
Input: sparse-keymap - send sync event for KE_SW/KE_VSW
Input: ar1021_i2c - set INPUT_PROP_DIRECT
arch/tile: Implement ->set_state_oneshot_stopped()
Update MIPS email addresses
x86: CPU: Fix up "cpu MHz" in /proc/cpuinfo
mm, swap: fix race between swap count continuation operations
mm/huge_memory.c: deposit page table when copying a PMD migration entry
initramfs: fix initramfs rebuilds w/ compression after disabling
fs/hugetlbfs/inode.c: fix hwpoison reserve accounting
ocfs2: fstrim: Fix start offset of first cluster group during fstrim
mm, /proc/pid/pagemap: fix soft dirty marking for PMD migration entry
userfaultfd: hugetlbfs: prevent UFFDIO_COPY to fill beyond the end of i_size
Documentation: Add Tim Bird to list of enforcement statement endorsers
net: systemport: Correct IPG length settings
tcp: do not mangle skb->cb[] in tcp_make_synack()
fib: fib_dump_info can no longer use __in_dev_get_rtnl
stmmac: use of_property_read_u32 instead of read_u8
net_sched: hold netns refcnt for each action
net_sched: acquire RTNL in tc_action_net_exit()
powerpc/perf: Fix core-imc hotplug callback failure during imc initialization
Kbuild: don't pass "-C" to preprocessor when processing linker scripts
Revert "x86: do not use cpufreq_quick_get() for /proc/cpuinfo "cpu MHz""
arm64: ensure __dump_instr() checks addr_limit
KVM: x86: Update APICv on APIC reset
KVM: VMX: Do not fully reset PI descriptor on vCPU reset
kvm: Return -ENODEV from update_persistent_clock
futex: futex_wake_op, do not fail on invalid op
MIPS: Update email address for Marcin Nowakowski
License cleanup: add SPDX license identifier to uapi header files with a license
License cleanup: add SPDX license identifier to uapi header files with no license
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
KEYS: fix out-of-bounds read during ASN.1 parsing
KEYS: trusted: fix writing past end of buffer in trusted_read()
KEYS: return full count in keyring_read() if buffer is too small
net: vrf: correct FRA_L3MDEV encode type
tcp_nv: fix division by zero in tcpnv_acked()
drm/amdgpu: allow harvesting check for Polaris VCE
drm/amdgpu: return -ENOENT from uvd 6.0 early init for harvesting
ARM: add debug ".edata_real" symbol
MIPS: smp-cmp: Fix vpe_id build error
MAINTAINERS: Update Pistachio platform maintainers
MIPS: smp-cmp: Use right include for task_struct
signal: Fix name of SIGEMT in #if defined() check
MIPS: Update Goldfish RTC driver maintainer email address
MIPS: Update RINT emulation maintainer email address
MIPS: CPS: Fix use of current_cpu_data in preemptible code
x86/mcelog: Get rid of RCU remnants
watchdog/hardlockup/perf: Use atomics to track in-use cpu counter
watchdog/harclockup/perf: Revert a33d44843d ("watchdog/hardlockup/perf: Simplify deferred event destroy")
ARM: 8716/1: pass endianness info to sparse
drm/i915: Check incoming alignment for unfenced buffers (on i915gm)
x86/mm: fix use-after-free of vma during userfaultfd fault
ide:ide-cd: fix kernel panic resulting from missing scsi_req_init
mmc: dw_mmc: Fix the DTO timeout calculation
tcp: fix tcp_mtu_probe() vs highest_sack
ipv6: addrconf: increment ifp refcount before ipv6_del_addr()
tun/tap: sanitize TUNSETSNDBUF input
mlxsw: i2c: Fix buffer increment counter for write transaction
netfilter: nf_reject_ipv4: Fix use-after-free in send_reset
futex: Fix more put_pi_state() vs. exit_pi_state_list() races
powerpc/kprobes: Dereference function pointers only if the address does not belong to kernel text
Revert "powerpc64/elfv1: Only dereference function descriptor for non-text symbols"
mlxsw: reg: Add high and low temperature thresholds
MAINTAINERS: Remove Yotam from mlxfw
MAINTAINERS: Update Yotam's E-mail
net: hns: set correct return value
net: lapbether: fix double free
bpf: remove SK_REDIRECT from UAPI
net: phy: marvell: Only configure RGMII delays when using RGMII
MIPS: SMP: Fix deadlock & online race
MIPS: bpf: Fix a typo in build_one_insn()
MIPS: microMIPS: Fix incorrect mask in insn_table_MM
MIPS: Fix CM region target definitions
MIPS: generic: Fix compilation error from include asm/mips-cpc.h
MIPS: Fix exception entry when CONFIG_EVA enabled
irqchip/irq-mvebu-gicp: Add missing spin_lock init
drm/nouveau/kms/nv50: use the correct state for base channel notifier setup
MIPS: generic: Fix NI 169445 its build
Update MIPS email addresses
tile: pass machine size to sparse
selftests: lib.mk: print individual test results to console by default
RDMA/nldev: Enforce device index check for port callback
Revert "PM / QoS: Fix device resume latency PM QoS"
Revert "PM / QoS: Fix default runtime_pm device resume latency"
scsi: qla2xxx: Fix oops in qla2x00_probe_one error path
xfrm: Fix GSO for IPsec with GRE tunnel.
ALSA: seq: Fix nested rwsem annotation for lockdep splat
ALSA: timer: Add missing mutex lock for compat ioctls
tc-testing: fix arg to ip command: -s -> -n
net_sched: remove tcf_block_put_deferred()
l2tp: hold tunnel in pppol2tp_connect()
drm/i915: Hold rcu_read_lock when iterating over the radixtree (vma idr)
drm/i915: Hold rcu_read_lock when iterating over the radixtree (objects)
drm/i915/edp: read edp display control registers unconditionally
drm/i915: Do not rely on wm preservation for ILK watermarks
drm/i915: Cancel the modeset retry work during modeset cleanup
Mark 'ioremap_page_range()' as possibly sleeping
nvme: Fix setting logical block format when revalidating
mmc: dw_mmc: Add locking to the CTO timer
mmc: dw_mmc: Fix the CTO timeout calculation
mmc: dw_mmc: cancel the CTO timer after a voltage switch
perf/cgroup: Fix perf cgroup hierarchy support
PM / QoS: Fix default runtime_pm device resume latency
Revert "ath10k: fix napi_poll budget overflow"
ath10k: rebuild crypto header in rx data frames
cifs: check MaxPathNameComponentLength != 0 before using it
KVM: arm/arm64: vgic-its: Check GITS_BASER Valid bit before saving tables
KVM: arm/arm64: vgic-its: Check CBASER/BASER validity before enabling the ITS
KVM: arm/arm64: vgic-its: Fix vgic_its_restore_collection_table returned value
KVM: arm/arm64: vgic-its: Fix return value for device table restore
efi/libstub: arm: omit sorting of the UEFI memory map
perf tools: Unwind properly location after REJECT
virtio_blk: Fix an SG_IO regression
wcn36xx: Remove unnecessary rcu_read_unlock in wcn36xx_bss_info_changed
ARM: dts: mvebu: pl310-cache disable double-linefill
xfrm: Clear sk_dst_cache when applying per-socket policy.
perf symbols: Fix memory corruption because of zero length symbols
powerpc/64s/radix: Fix preempt imbalance in TLB flush
netfilter: nft_set_hash: disable fast_ops for 2-len keys
powerpc: Fix check for copy/paste instructions in alignment handler
powerpc/perf: Fix IMC allocation routine
xfrm: Fix xfrm_dst_cache memleak
ARM: 8715/1: add a private asm/unaligned.h
clk: uniphier: fix clock data for PXs3
Documentation: Add my name to kernel enforcement statement
nvme-rdma: fix possible hang when issuing commands during ctrl removal
arm/arm64: kvm: Disable branch profiling in HYP code
arm/arm64: kvm: Move initialization completion message
arm/arm64: KVM: set right LR register value for 32 bit guest when inject abort
Documentation: kernel-enforcement-statement.rst: proper sort names
ASoC: rt5616: fix 0x91 default value
Documentation: Add Arm Ltd to kernel-enforcement-statement.rst
arm64: dts: uniphier: add STDMAC clock to EHCI nodes
ARM: dts: uniphier: add STDMAC clock to EHCI nodes
mmc: renesas_sdhi: fix kernel panic in _internal_dmac.c
mmc: tmio: fix swiotlb buffer is full
Documentation: kernel-enforcement-statement.rst: Remove Red Hat markings
Documentation: Add myself to the enforcement statement list
Documentation: Sign kernel enforcement statement
Add ack for Trond Myklebust to the enforcement statement
Documentation: update kernel enforcement support list
Documentation: add my name to supporters
ASoC: rt5659: connect LOUT Amp with Charge Pump
ASoC: rt5659: register power bit of LOUT Amp
KVM: arm64: its: Fix missing dynamic allocation check in scan_its_table
crypto: x86/chacha20 - satisfy stack validation 2.0
ASoC: rt5663: Change the dev getting function in rt5663_irq
ASoC: rt5514: Revert Hotword Model control
ASoC: topology: Fix a potential memory leak in 'soc_tplg_dapm_widget_denum_create()'
ASoC: topology: Fix a potential NULL pointer dereference in 'soc_tplg_dapm_widget_denum_create()'
ASoC: rt5514-spi: check irq status to schedule data copy
ASoC: adau17x1: Workaround for noise bug in ADC
Conflicts:
drivers/gpu/drm/msm/Makefile
drivers/soc/qcom/Makefile
drivers/staging/android/ion/Makefile
include/linux/coresight-stm.h
include/trace/events/kmem.h
Change-Id: I01f1779762b652b9213924caa3d54f29cf03d285
Signed-off-by: Runmin Wang <runminw@codeaurora.org>
165 lines
4.8 KiB
C
165 lines
4.8 KiB
C
/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
|
|
/***************************************************************************
|
|
* Linux PPP over X - Generic PPP transport layer sockets
|
|
* Linux PPP over Ethernet (PPPoE) Socket Implementation (RFC 2516)
|
|
*
|
|
* This file supplies definitions required by the PPP over Ethernet driver
|
|
* (pppox.c). All version information wrt this file is located in pppox.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 _UAPI__LINUX_IF_PPPOX_H
|
|
#define _UAPI__LINUX_IF_PPPOX_H
|
|
|
|
|
|
#include <linux/types.h>
|
|
#include <asm/byteorder.h>
|
|
|
|
#include <linux/socket.h>
|
|
#include <linux/if.h>
|
|
#include <linux/if_ether.h>
|
|
#include <linux/if_pppol2tp.h>
|
|
#include <linux/if_pppolac.h>
|
|
#include <linux/if_pppopns.h>
|
|
#include <linux/in.h>
|
|
#include <linux/in6.h>
|
|
|
|
/* For user-space programs to pick up these definitions
|
|
* which they wouldn't get otherwise without defining __KERNEL__
|
|
*/
|
|
#ifndef AF_PPPOX
|
|
#define AF_PPPOX 24
|
|
#define PF_PPPOX AF_PPPOX
|
|
#endif /* !(AF_PPPOX) */
|
|
|
|
/************************************************************************
|
|
* PPPoE addressing definition
|
|
*/
|
|
typedef __be16 sid_t;
|
|
struct pppoe_addr {
|
|
sid_t sid; /* Session identifier */
|
|
unsigned char remote[ETH_ALEN]; /* Remote address */
|
|
char dev[IFNAMSIZ]; /* Local device to use */
|
|
};
|
|
|
|
/************************************************************************
|
|
* PPTP addressing definition
|
|
*/
|
|
struct pptp_addr {
|
|
__u16 call_id;
|
|
struct in_addr sin_addr;
|
|
};
|
|
|
|
/************************************************************************
|
|
* Protocols supported by AF_PPPOX
|
|
*/
|
|
#define PX_PROTO_OE 0 /* Currently just PPPoE */
|
|
#define PX_PROTO_OL2TP 1 /* Now L2TP also */
|
|
#define PX_PROTO_PPTP 2
|
|
#define PX_PROTO_OLAC 3
|
|
#define PX_PROTO_OPNS 4
|
|
#define PX_MAX_PROTO 5
|
|
|
|
struct sockaddr_pppox {
|
|
__kernel_sa_family_t sa_family; /* address family, AF_PPPOX */
|
|
unsigned int sa_protocol; /* protocol identifier */
|
|
union {
|
|
struct pppoe_addr pppoe;
|
|
struct pptp_addr pptp;
|
|
} sa_addr;
|
|
} __packed;
|
|
|
|
/* The use of the above union isn't viable because the size of this
|
|
* struct must stay fixed over time -- applications use sizeof(struct
|
|
* sockaddr_pppox) to fill it. We use a protocol specific sockaddr
|
|
* type instead.
|
|
*/
|
|
struct sockaddr_pppol2tp {
|
|
__kernel_sa_family_t sa_family; /* address family, AF_PPPOX */
|
|
unsigned int sa_protocol; /* protocol identifier */
|
|
struct pppol2tp_addr pppol2tp;
|
|
} __packed;
|
|
|
|
struct sockaddr_pppol2tpin6 {
|
|
__kernel_sa_family_t sa_family; /* address family, AF_PPPOX */
|
|
unsigned int sa_protocol; /* protocol identifier */
|
|
struct pppol2tpin6_addr pppol2tp;
|
|
} __packed;
|
|
|
|
/* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
|
|
* bits. So we need a different sockaddr structure.
|
|
*/
|
|
struct sockaddr_pppol2tpv3 {
|
|
__kernel_sa_family_t sa_family; /* address family, AF_PPPOX */
|
|
unsigned int sa_protocol; /* protocol identifier */
|
|
struct pppol2tpv3_addr pppol2tp;
|
|
} __packed;
|
|
|
|
struct sockaddr_pppol2tpv3in6 {
|
|
__kernel_sa_family_t sa_family; /* address family, AF_PPPOX */
|
|
unsigned int sa_protocol; /* protocol identifier */
|
|
struct pppol2tpv3in6_addr pppol2tp;
|
|
} __packed;
|
|
|
|
/*********************************************************************
|
|
*
|
|
* ioctl interface for defining forwarding of connections
|
|
*
|
|
********************************************************************/
|
|
|
|
#define PPPOEIOCSFWD _IOW(0xB1 ,0, size_t)
|
|
#define PPPOEIOCDFWD _IO(0xB1 ,1)
|
|
/*#define PPPOEIOCGFWD _IOWR(0xB1,2, size_t)*/
|
|
|
|
/* Codes to identify message types */
|
|
#define PADI_CODE 0x09
|
|
#define PADO_CODE 0x07
|
|
#define PADR_CODE 0x19
|
|
#define PADS_CODE 0x65
|
|
#define PADT_CODE 0xa7
|
|
struct pppoe_tag {
|
|
__be16 tag_type;
|
|
__be16 tag_len;
|
|
char tag_data[0];
|
|
} __attribute__ ((packed));
|
|
|
|
/* Tag identifiers */
|
|
#define PTT_EOL __cpu_to_be16(0x0000)
|
|
#define PTT_SRV_NAME __cpu_to_be16(0x0101)
|
|
#define PTT_AC_NAME __cpu_to_be16(0x0102)
|
|
#define PTT_HOST_UNIQ __cpu_to_be16(0x0103)
|
|
#define PTT_AC_COOKIE __cpu_to_be16(0x0104)
|
|
#define PTT_VENDOR __cpu_to_be16(0x0105)
|
|
#define PTT_RELAY_SID __cpu_to_be16(0x0110)
|
|
#define PTT_SRV_ERR __cpu_to_be16(0x0201)
|
|
#define PTT_SYS_ERR __cpu_to_be16(0x0202)
|
|
#define PTT_GEN_ERR __cpu_to_be16(0x0203)
|
|
|
|
struct pppoe_hdr {
|
|
#if defined(__LITTLE_ENDIAN_BITFIELD)
|
|
__u8 type : 4;
|
|
__u8 ver : 4;
|
|
#elif defined(__BIG_ENDIAN_BITFIELD)
|
|
__u8 ver : 4;
|
|
__u8 type : 4;
|
|
#else
|
|
#error "Please fix <asm/byteorder.h>"
|
|
#endif
|
|
__u8 code;
|
|
__be16 sid;
|
|
__be16 length;
|
|
struct pppoe_tag tag[0];
|
|
} __packed;
|
|
|
|
/* Length of entire PPPoE + PPP header */
|
|
#define PPPOE_SES_HLEN 8
|
|
|
|
|
|
#endif /* _UAPI__LINUX_IF_PPPOX_H */
|