Update kernel uapi headers to v3.16.1.
Other changes to support the new headers: - Remove the flock64 structure it is defined in the new headers. - Update the syscalls to correspond with the headers. Change-Id: I49a6b07e8b2bfffb67be71b07b58e4e6848fcc09
This commit is contained in:
		| @@ -26,186 +26,185 @@ | ||||
| #define IFALIASZ 256 | ||||
| #include <linux/hdlc/ioctl.h> | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| #define IFF_UP 0x1 | ||||
| #define IFF_BROADCAST 0x2 | ||||
| #define IFF_DEBUG 0x4 | ||||
| #define IFF_LOOPBACK 0x8 | ||||
| enum net_device_flags { | ||||
|  IFF_UP = 1<<0, | ||||
|  IFF_BROADCAST = 1<<1, | ||||
|  IFF_DEBUG = 1<<2, | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| #define IFF_POINTOPOINT 0x10 | ||||
| #define IFF_NOTRAILERS 0x20 | ||||
| #define IFF_RUNNING 0x40 | ||||
| #define IFF_NOARP 0x80 | ||||
|  IFF_LOOPBACK = 1<<3, | ||||
|  IFF_POINTOPOINT = 1<<4, | ||||
|  IFF_NOTRAILERS = 1<<5, | ||||
|  IFF_RUNNING = 1<<6, | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| #define IFF_PROMISC 0x100 | ||||
| #define IFF_ALLMULTI 0x200 | ||||
| #define IFF_MASTER 0x400 | ||||
| #define IFF_SLAVE 0x800 | ||||
|  IFF_NOARP = 1<<7, | ||||
|  IFF_PROMISC = 1<<8, | ||||
|  IFF_ALLMULTI = 1<<9, | ||||
|  IFF_MASTER = 1<<10, | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| #define IFF_MULTICAST 0x1000 | ||||
| #define IFF_PORTSEL 0x2000 | ||||
| #define IFF_AUTOMEDIA 0x4000 | ||||
| #define IFF_DYNAMIC 0x8000 | ||||
|  IFF_SLAVE = 1<<11, | ||||
|  IFF_MULTICAST = 1<<12, | ||||
|  IFF_PORTSEL = 1<<13, | ||||
|  IFF_AUTOMEDIA = 1<<14, | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
|  IFF_DYNAMIC = 1<<15, | ||||
|  IFF_LOWER_UP = 1<<16, | ||||
|  IFF_DORMANT = 1<<17, | ||||
|  IFF_ECHO = 1<<18, | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| }; | ||||
| #define IFF_UP IFF_UP | ||||
| #define IFF_BROADCAST IFF_BROADCAST | ||||
| #define IFF_DEBUG IFF_DEBUG | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| #define IFF_LOOPBACK IFF_LOOPBACK | ||||
| #define IFF_POINTOPOINT IFF_POINTOPOINT | ||||
| #define IFF_NOTRAILERS IFF_NOTRAILERS | ||||
| #define IFF_RUNNING IFF_RUNNING | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| #define IFF_NOARP IFF_NOARP | ||||
| #define IFF_PROMISC IFF_PROMISC | ||||
| #define IFF_ALLMULTI IFF_ALLMULTI | ||||
| #define IFF_MASTER IFF_MASTER | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| #define IFF_SLAVE IFF_SLAVE | ||||
| #define IFF_MULTICAST IFF_MULTICAST | ||||
| #define IFF_PORTSEL IFF_PORTSEL | ||||
| #define IFF_AUTOMEDIA IFF_AUTOMEDIA | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| #define IFF_DYNAMIC IFF_DYNAMIC | ||||
| #define IFF_LOWER_UP IFF_LOWER_UP | ||||
| #define IFF_DORMANT IFF_DORMANT | ||||
| #define IFF_ECHO IFF_ECHO | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| #define IFF_LOWER_UP 0x10000 | ||||
| #define IFF_DORMANT 0x20000 | ||||
| #define IFF_ECHO 0x40000 | ||||
| #define IFF_VOLATILE (IFF_LOOPBACK|IFF_POINTOPOINT|IFF_BROADCAST|IFF_ECHO|  IFF_MASTER|IFF_SLAVE|IFF_RUNNING|IFF_LOWER_UP|IFF_DORMANT) | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| #define IFF_802_1Q_VLAN 0x1 | ||||
| #define IFF_EBRIDGE 0x2 | ||||
| #define IFF_SLAVE_INACTIVE 0x4 | ||||
| #define IFF_MASTER_8023AD 0x8 | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| #define IFF_MASTER_ALB 0x10 | ||||
| #define IFF_BONDING 0x20 | ||||
| #define IFF_SLAVE_NEEDARP 0x40 | ||||
| #define IFF_ISATAP 0x80 | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| #define IFF_MASTER_ARPMON 0x100 | ||||
| #define IFF_WAN_HDLC 0x200 | ||||
| #define IFF_XMIT_DST_RELEASE 0x400 | ||||
| #define IFF_DONT_BRIDGE 0x800 | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| #define IFF_DISABLE_NETPOLL 0x1000 | ||||
| #define IFF_MACVLAN_PORT 0x2000 | ||||
| #define IFF_BRIDGE_PORT 0x4000 | ||||
| #define IFF_OVS_DATAPATH 0x8000 | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| #define IFF_TX_SKB_SHARING 0x10000 | ||||
| #define IFF_UNICAST_FLT 0x20000 | ||||
| #define IFF_TEAM_PORT 0x40000 | ||||
| #define IFF_SUPP_NOFCS 0x80000 | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| #define IFF_LIVE_ADDR_CHANGE 0x100000 | ||||
| #define IFF_MACVLAN 0x200000 | ||||
| #define IF_GET_IFACE 0x0001 | ||||
| #define IF_GET_PROTO 0x0002 | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| #define IF_IFACE_V35 0x1000 | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| #define IF_IFACE_V24 0x1001 | ||||
| #define IF_IFACE_X21 0x1002 | ||||
| #define IF_IFACE_T1 0x1003 | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| #define IF_IFACE_E1 0x1004 | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| #define IF_IFACE_SYNC_SERIAL 0x1005 | ||||
| #define IF_IFACE_X21D 0x1006 | ||||
| #define IF_PROTO_HDLC 0x2000 | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| #define IF_PROTO_PPP 0x2001 | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| #define IF_PROTO_CISCO 0x2002 | ||||
| #define IF_PROTO_FR 0x2003 | ||||
| #define IF_PROTO_FR_ADD_PVC 0x2004 | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| #define IF_PROTO_FR_DEL_PVC 0x2005 | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| #define IF_PROTO_X25 0x2006 | ||||
| #define IF_PROTO_HDLC_ETH 0x2007 | ||||
| #define IF_PROTO_FR_ADD_ETH_PVC 0x2008 | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| #define IF_PROTO_FR_DEL_ETH_PVC 0x2009 | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| #define IF_PROTO_FR_PVC 0x200A | ||||
| #define IF_PROTO_FR_ETH_PVC 0x200B | ||||
| #define IF_PROTO_RAW 0x200C | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| enum { | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
|  IF_OPER_UNKNOWN, | ||||
|  IF_OPER_NOTPRESENT, | ||||
|  IF_OPER_DOWN, | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
|  IF_OPER_LOWERLAYERDOWN, | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
|  IF_OPER_TESTING, | ||||
|  IF_OPER_DORMANT, | ||||
|  IF_OPER_UP, | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| }; | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| enum { | ||||
|  IF_LINK_MODE_DEFAULT, | ||||
|  IF_LINK_MODE_DORMANT, | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| }; | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| struct ifmap { | ||||
|  unsigned long mem_start; | ||||
|  unsigned long mem_end; | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
|  unsigned short base_addr; | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
|  unsigned char irq; | ||||
|  unsigned char dma; | ||||
|  unsigned char port; | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| }; | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| struct if_settings { | ||||
|  unsigned int type; | ||||
|  unsigned int size; | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
|  union { | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
|  raw_hdlc_proto __user *raw_hdlc; | ||||
|  cisco_proto __user *cisco; | ||||
|  fr_proto __user *fr; | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
|  fr_proto_pvc __user *fr_pvc; | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
|  fr_proto_pvc_info __user *fr_pvc_info; | ||||
|  sync_serial_settings __user *sync; | ||||
|  te1_settings __user *te1; | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
|  } ifs_ifsu; | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| }; | ||||
| struct ifreq { | ||||
| #define IFHWADDRLEN 6 | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
|  union | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
|  { | ||||
|  char ifrn_name[IFNAMSIZ]; | ||||
|  } ifr_ifrn; | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
|  union { | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
|  struct sockaddr ifru_addr; | ||||
|  struct sockaddr ifru_dstaddr; | ||||
|  struct sockaddr ifru_broadaddr; | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
|  struct sockaddr ifru_netmask; | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
|  struct sockaddr ifru_hwaddr; | ||||
|  short ifru_flags; | ||||
|  int ifru_ivalue; | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
|  int ifru_mtu; | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
|  struct ifmap ifru_map; | ||||
|  char ifru_slave[IFNAMSIZ]; | ||||
|  char ifru_newname[IFNAMSIZ]; | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
|  void __user * ifru_data; | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
|  struct if_settings ifru_settings; | ||||
|  } ifr_ifru; | ||||
| }; | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| #define ifr_name ifr_ifrn.ifrn_name | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| #define ifr_hwaddr ifr_ifru.ifru_hwaddr | ||||
| #define ifr_addr ifr_ifru.ifru_addr | ||||
| #define ifr_dstaddr ifr_ifru.ifru_dstaddr | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| #define ifr_broadaddr ifr_ifru.ifru_broadaddr | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| #define ifr_netmask ifr_ifru.ifru_netmask | ||||
| #define ifr_flags ifr_ifru.ifru_flags | ||||
| #define ifr_metric ifr_ifru.ifru_ivalue | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| #define ifr_mtu ifr_ifru.ifru_mtu | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| #define ifr_map ifr_ifru.ifru_map | ||||
| #define ifr_slave ifr_ifru.ifru_slave | ||||
| #define ifr_data ifr_ifru.ifru_data | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| #define ifr_ifindex ifr_ifru.ifru_ivalue | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| #define ifr_bandwidth ifr_ifru.ifru_ivalue | ||||
| #define ifr_qlen ifr_ifru.ifru_ivalue | ||||
| #define ifr_newname ifr_ifru.ifru_newname | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| #define ifr_settings ifr_ifru.ifru_settings | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| struct ifconf { | ||||
|  int ifc_len; | ||||
|  union { | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
|  char __user *ifcu_buf; | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
|  struct ifreq __user *ifcu_req; | ||||
|  } ifc_ifcu; | ||||
| }; | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| #define ifc_buf ifc_ifcu.ifcu_buf | ||||
| /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ | ||||
| #define ifc_req ifc_ifcu.ifcu_req | ||||
| #endif | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Christopher Ferris
					Christopher Ferris