c7cb7ae16c
Merge 4.9.159 into android-4.9
Linux 4.9.159
Revert "scsi: aic94xx: fix module loading"
* uapi/if_ether.h: move __UAPI_DEF_ETHHDR libc define
include/uapi/linux/if_ether.h
include/uapi/linux/libc-compat.h
* mm: stop leaking PageTables
mm/memory.c
* pinctrl: msm: fix gpio-hog related boot issues
drivers/pinctrl/qcom/pinctrl-msm.c
netfilter: nf_tables: fix mismatch in big-endian system
usb: dwc2: Remove unnecessary kfree
kaweth: use skb_cow_head() to deal with cloned skbs
ch9200: use skb_cow_head() to deal with cloned skbs
smsc95xx: Use skb_cow_head to deal with cloned skbs
drm/i915: Prevent a race during I915_GEM_MMAP ioctl with WC set
dm thin: fix bug where bio that overwrites thin block ignores FUA
x86/a.out: Clear the dump structure initially
* signal: Restore the stop PTRACE_EVENT_EXIT
kernel/signal.c
x86/platform/UV: Use efi_runtime_lock to serialise BIOS calls
tracing/uprobes: Fix output for multiple string arguments
alpha: Fix Eiger NR_IRQS to 128
alpha: fix page fault handling for r16-r18 targets
Input: elantech - enable 3rd button support on Fujitsu CELSIUS H780
Input: bma150 - register input device after setting private data
kvm: vmx: Fix entry number check for add_atomic_switch_msr()
* ALSA: usb-audio: Fix implicit fb endpoint setup by quirk
sound/usb/pcm.c
ALSA: hda - Add quirk for HP EliteBook 840 G5
* perf/x86: Add check_period PMU callback
include/linux/perf_event.h
kernel/events/core.c
* perf/core: Fix impossible ring-buffer sizes warning
kernel/events/ring_buffer.c
Input: elan_i2c - add ACPI ID for touchpad in Lenovo V330-15ISK
Revert "Input: elan_i2c - add ACPI ID for touchpad in ASUS Aspire F5-573G"
perf report: Include partial stacks unwound with libdw
cifs: Limit memory used by lock request calls to a page
gpio: pl061: handle failed allocations
ARM: dts: kirkwood: Fix polarity of GPIO fan lines
ARM: dts: da850-lcdk: Correct the sound card name
ARM: dts: da850-evm: Correct the sound card name
drm/bridge: tc358767: fix output H/V syncs
drm/bridge: tc358767: reject modes which require too much BW
drm/bridge: tc358767: fix initial DP0/1_SRCCTRL value
drm/bridge: tc358767: fix single lane configuration
drm/bridge: tc358767: add defines for DP1_SRCCTRL & PHY_2LANE
* cpufreq: check if policy is inactive early in __cpufreq_get()
drivers/cpufreq/cpufreq.c
ACPI: NUMA: Use correct type for printing addresses on i386-PAE
bnx2x: disable GSO where gso_size is too big for hardware
* net: create skb_gso_validate_mac_len()
include/linux/skbuff.h
net/core/skbuff.c
ARM: fix the cockup in the previous patch
ARM: ensure that processor vtables is not lost after boot
ARM: spectre-v2: per-CPU vtables to work around big.Little systems
ARM: add PROC_VTABLE and PROC_TABLE macros
ARM: clean up per-processor check_bugs method call
ARM: split out processor lookup
ARM: make lookup_processor_type() non-__init
ARM: 8810/1: vfp: Fix wrong assignement to ufp_exc
ARM: 8797/1: spectre-v1.1: harden __copy_to_user
ARM: 8796/1: spectre-v1,v1.1: provide helpers for address sanitization
ARM: 8795/1: spectre-v1.1: use put_user() for __put_user()
ARM: 8794/1: uaccess: Prevent speculative use of the current addr_limit
ARM: 8793/1: signal: replace __put_user_error with __put_user
ARM: 8792/1: oabi-compat: copy oabi events using __copy_to_user()
ARM: 8791/1: vfp: use __copy_to_user() when saving VFP state
ARM: 8789/1: signal: copy registers using __copy_to_user()
* uapi/if_ether.h: prevent redefinition of struct ethhdr
include/uapi/linux/if_ether.h
include/uapi/linux/libc-compat.h
* eeprom: at24: add support for 24c2048
drivers/misc/eeprom/Kconfig
dt-bindings: eeprom: at24: add "atmel,24c2048" compatible string
BACKPORT: userfaultfd: shmem/hugetlbfs: only allow to register VM_MAYWRITE vmas
ANDROID: cuttlefish_defconfig: Enable DEBUG_SET_MODULE_RONX
Merge 4.9.158 into android-4.9
Linux 4.9.158
* Revert "exec: load_script: don't blindly truncate shebang string"
fs/binfmt_script.c
Merge 4.9.157 into android-4.9
Linux 4.9.157
batman-adv: Force mac header to start of data on xmit
batman-adv: Avoid WARN on net_device without parent in netns
* xfrm: refine validation of template and selector families
net/xfrm/xfrm_user.c
libceph: avoid KEEPALIVE_PENDING races in ceph_con_keepalive()
* Revert "cifs: In Kconfig CONFIG_CIFS_POSIX needs depends on legacy (insecure cifs)"
fs/cifs/Kconfig
* HID: debug: fix the ring buffer implementation
drivers/hid/hid-debug.c
include/linux/hid-debug.h
nfsd4: catch some false session retries
nfsd4: fix cached replies to solo SEQUENCE compounds
drm/vmwgfx: Return error code from vmw_execbuf_copy_fence_user
drm/vmwgfx: Fix setting of dma masks
* drm/modes: Prevent division by zero htotal
drivers/gpu/drm/drm_modes.c
mac80211: ensure that mgmt tx skbs have tailroom for encryption
ARM: tango: Improve ARCH_MULTIPLATFORM compatibility
ARM: iop32x/n2100: fix PCI IRQ mapping
MIPS: VDSO: Include $(ccflags-vdso) in o32,n32 .lds builds
MIPS: OCTEON: don't set octeon_dma_bar_type if PCI is disabled
mips: cm: reprime error cause
* debugfs: fix debugfs_rename parameter checking
fs/debugfs/inode.c
samples: mei: use /dev/mei0 instead of /dev/mei
misc: vexpress: Off by one in vexpress_syscfg_exec()
* signal: Better detection of synchronous signals
kernel/signal.c
* signal: Always notice exiting tasks
kernel/signal.c
iio: chemical: atlas-ph-sensor: correct IIO_TEMP values to millicelsius
mtd: rawnand: gpmi: fix MX28 bus master lockup problem
ANDROID: cuttlefish: enable CONFIG_NET_SCH_NETEM=y
Add XFRM-I to cuttlefish defconfigs
ANDROID: Move from clang r346389b to r349610.
Change-Id: I000fc05db9aa733cfa7027025d690d5e0fd0e683
Signed-off-by: Petri Gynther <pgynther@google.com>
159 lines
7.4 KiB
C
159 lines
7.4 KiB
C
/*
|
|
* INET An implementation of the TCP/IP protocol suite for the LINUX
|
|
* operating system. INET is implemented using the BSD Socket
|
|
* interface as the means of communication with the user level.
|
|
*
|
|
* Global definitions for the Ethernet IEEE 802.3 interface.
|
|
*
|
|
* Version: @(#)if_ether.h 1.0.1a 02/08/94
|
|
*
|
|
* Author: Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
|
|
* Donald Becker, <becker@super.org>
|
|
* Alan Cox, <alan@lxorguk.ukuu.org.uk>
|
|
* Steve Whitehouse, <gw7rrm@eeshack3.swan.ac.uk>
|
|
*
|
|
* 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_ETHER_H
|
|
#define _UAPI_LINUX_IF_ETHER_H
|
|
|
|
#include <linux/types.h>
|
|
|
|
/*
|
|
* IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble
|
|
* and FCS/CRC (frame check sequence).
|
|
*/
|
|
|
|
#define ETH_ALEN 6 /* Octets in one ethernet addr */
|
|
#define ETH_TLEN 2 /* Octets in ethernet type field */
|
|
#define ETH_HLEN 14 /* Total octets in header. */
|
|
#define ETH_ZLEN 60 /* Min. octets in frame sans FCS */
|
|
#define ETH_DATA_LEN 1500 /* Max. octets in payload */
|
|
#define ETH_FRAME_LEN 1514 /* Max. octets in frame sans FCS */
|
|
#define ETH_FCS_LEN 4 /* Octets in the FCS */
|
|
|
|
/*
|
|
* These are the defined Ethernet Protocol ID's.
|
|
*/
|
|
|
|
#define ETH_P_LOOP 0x0060 /* Ethernet Loopback packet */
|
|
#define ETH_P_PUP 0x0200 /* Xerox PUP packet */
|
|
#define ETH_P_PUPAT 0x0201 /* Xerox PUP Addr Trans packet */
|
|
#define ETH_P_TSN 0x22F0 /* TSN (IEEE 1722) packet */
|
|
#define ETH_P_IP 0x0800 /* Internet Protocol packet */
|
|
#define ETH_P_X25 0x0805 /* CCITT X.25 */
|
|
#define ETH_P_ARP 0x0806 /* Address Resolution packet */
|
|
#define ETH_P_BPQ 0x08FF /* G8BPQ AX.25 Ethernet Packet [ NOT AN OFFICIALLY REGISTERED ID ] */
|
|
#define ETH_P_IEEEPUP 0x0a00 /* Xerox IEEE802.3 PUP packet */
|
|
#define ETH_P_IEEEPUPAT 0x0a01 /* Xerox IEEE802.3 PUP Addr Trans packet */
|
|
#define ETH_P_BATMAN 0x4305 /* B.A.T.M.A.N.-Advanced packet [ NOT AN OFFICIALLY REGISTERED ID ] */
|
|
#define ETH_P_DEC 0x6000 /* DEC Assigned proto */
|
|
#define ETH_P_DNA_DL 0x6001 /* DEC DNA Dump/Load */
|
|
#define ETH_P_DNA_RC 0x6002 /* DEC DNA Remote Console */
|
|
#define ETH_P_DNA_RT 0x6003 /* DEC DNA Routing */
|
|
#define ETH_P_LAT 0x6004 /* DEC LAT */
|
|
#define ETH_P_DIAG 0x6005 /* DEC Diagnostics */
|
|
#define ETH_P_CUST 0x6006 /* DEC Customer use */
|
|
#define ETH_P_SCA 0x6007 /* DEC Systems Comms Arch */
|
|
#define ETH_P_TEB 0x6558 /* Trans Ether Bridging */
|
|
#define ETH_P_RARP 0x8035 /* Reverse Addr Res packet */
|
|
#define ETH_P_ATALK 0x809B /* Appletalk DDP */
|
|
#define ETH_P_AARP 0x80F3 /* Appletalk AARP */
|
|
#define ETH_P_8021Q 0x8100 /* 802.1Q VLAN Extended Header */
|
|
#define ETH_P_IPX 0x8137 /* IPX over DIX */
|
|
#define ETH_P_IPV6 0x86DD /* IPv6 over bluebook */
|
|
#define ETH_P_PAUSE 0x8808 /* IEEE Pause frames. See 802.3 31B */
|
|
#define ETH_P_SLOW 0x8809 /* Slow Protocol. See 802.3ad 43B */
|
|
#define ETH_P_WCCP 0x883E /* Web-cache coordination protocol
|
|
* defined in draft-wilson-wrec-wccp-v2-00.txt */
|
|
#define ETH_P_MPLS_UC 0x8847 /* MPLS Unicast traffic */
|
|
#define ETH_P_MPLS_MC 0x8848 /* MPLS Multicast traffic */
|
|
#define ETH_P_ATMMPOA 0x884c /* MultiProtocol Over ATM */
|
|
#define ETH_P_PPP_DISC 0x8863 /* PPPoE discovery messages */
|
|
#define ETH_P_PPP_SES 0x8864 /* PPPoE session messages */
|
|
#define ETH_P_LINK_CTL 0x886c /* HPNA, wlan link local tunnel */
|
|
#define ETH_P_ATMFATE 0x8884 /* Frame-based ATM Transport
|
|
* over Ethernet
|
|
*/
|
|
#define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */
|
|
#define ETH_P_AOE 0x88A2 /* ATA over Ethernet */
|
|
#define ETH_P_8021AD 0x88A8 /* 802.1ad Service VLAN */
|
|
#define ETH_P_802_EX1 0x88B5 /* 802.1 Local Experimental 1. */
|
|
#define ETH_P_TIPC 0x88CA /* TIPC */
|
|
#define ETH_P_MACSEC 0x88E5 /* 802.1ae MACsec */
|
|
#define ETH_P_8021AH 0x88E7 /* 802.1ah Backbone Service Tag */
|
|
#define ETH_P_MVRP 0x88F5 /* 802.1Q MVRP */
|
|
#define ETH_P_1588 0x88F7 /* IEEE 1588 Timesync */
|
|
#define ETH_P_NCSI 0x88F8 /* NCSI protocol */
|
|
#define ETH_P_PRP 0x88FB /* IEC 62439-3 PRP/HSRv0 */
|
|
#define ETH_P_FCOE 0x8906 /* Fibre Channel over Ethernet */
|
|
#define ETH_P_TDLS 0x890D /* TDLS */
|
|
#define ETH_P_FIP 0x8914 /* FCoE Initialization Protocol */
|
|
#define ETH_P_80221 0x8917 /* IEEE 802.21 Media Independent Handover Protocol */
|
|
#define ETH_P_HSR 0x892F /* IEC 62439-3 HSRv1 */
|
|
#define ETH_P_LOOPBACK 0x9000 /* Ethernet loopback packet, per IEEE 802.3 */
|
|
#define ETH_P_QINQ1 0x9100 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */
|
|
#define ETH_P_QINQ2 0x9200 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */
|
|
#define ETH_P_QINQ3 0x9300 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */
|
|
#define ETH_P_EDSA 0xDADA /* Ethertype DSA [ NOT AN OFFICIALLY REGISTERED ID ] */
|
|
#define ETH_P_AF_IUCV 0xFBFB /* IBM af_iucv [ NOT AN OFFICIALLY REGISTERED ID ] */
|
|
|
|
#define ETH_P_802_3_MIN 0x0600 /* If the value in the ethernet type is less than this value
|
|
* then the frame is Ethernet II. Else it is 802.3 */
|
|
#define ETH_P_MAP 0xDA1A /* Multiplexing and Aggregation Protocol
|
|
* NOT AN OFFICIALLY REGISTERED ID ]
|
|
*/
|
|
/*
|
|
* Non DIX types. Won't clash for 1500 types.
|
|
*/
|
|
|
|
#define ETH_P_802_3 0x0001 /* Dummy type for 802.3 frames */
|
|
#define ETH_P_AX25 0x0002 /* Dummy protocol id for AX.25 */
|
|
#define ETH_P_ALL 0x0003 /* Every packet (be careful!!!) */
|
|
#define ETH_P_802_2 0x0004 /* 802.2 frames */
|
|
#define ETH_P_SNAP 0x0005 /* Internal only */
|
|
#define ETH_P_DDCMP 0x0006 /* DEC DDCMP: Internal only */
|
|
#define ETH_P_WAN_PPP 0x0007 /* Dummy type for WAN PPP frames*/
|
|
#define ETH_P_PPP_MP 0x0008 /* Dummy type for PPP MP frames */
|
|
#define ETH_P_LOCALTALK 0x0009 /* Localtalk pseudo type */
|
|
#define ETH_P_CAN 0x000C /* CAN: Controller Area Network */
|
|
#define ETH_P_CANFD 0x000D /* CANFD: CAN flexible data rate*/
|
|
#define ETH_P_PPPTALK 0x0010 /* Dummy type for Atalk over PPP*/
|
|
#define ETH_P_TR_802_2 0x0011 /* 802.2 frames */
|
|
#define ETH_P_MOBITEX 0x0015 /* Mobitex (kaz@cafe.net) */
|
|
#define ETH_P_CONTROL 0x0016 /* Card specific control frames */
|
|
#define ETH_P_IRDA 0x0017 /* Linux-IrDA */
|
|
#define ETH_P_ECONET 0x0018 /* Acorn Econet */
|
|
#define ETH_P_HDLC 0x0019 /* HDLC frames */
|
|
#define ETH_P_ARCNET 0x001A /* 1A for ArcNet :-) */
|
|
#define ETH_P_DSA 0x001B /* Distributed Switch Arch. */
|
|
#define ETH_P_TRAILER 0x001C /* Trailer switch tagging */
|
|
#define ETH_P_PHONET 0x00F5 /* Nokia Phonet frames */
|
|
#define ETH_P_IEEE802154 0x00F6 /* IEEE802.15.4 frame */
|
|
#define ETH_P_CAIF 0x00F7 /* ST-Ericsson CAIF protocol */
|
|
#define ETH_P_XDSA 0x00F8 /* Multiplexed DSA protocol */
|
|
|
|
/*
|
|
* This is an Ethernet frame header.
|
|
*/
|
|
|
|
/* allow libcs like musl to deactivate this, glibc does not implement this. */
|
|
#ifndef __UAPI_DEF_ETHHDR
|
|
#define __UAPI_DEF_ETHHDR 1
|
|
#endif
|
|
|
|
#if __UAPI_DEF_ETHHDR
|
|
struct ethhdr {
|
|
unsigned char h_dest[ETH_ALEN]; /* destination eth addr */
|
|
unsigned char h_source[ETH_ALEN]; /* source ether addr */
|
|
__be16 h_proto; /* packet type ID field */
|
|
} __attribute__((packed));
|
|
#endif
|
|
|
|
|
|
#endif /* _UAPI_LINUX_IF_ETHER_H */
|