From: Stephen Hemminger Date: Tue, 11 Dec 2012 19:16:36 +0000 (-0800) Subject: Update kernel headers to 3.8-pre X-Git-Tag: v3.8.0~3^2~57 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=910773dc0df1131cbe5220d8b6971ae44a7221bd;p=thirdparty%2Fiproute2.git Update kernel headers to 3.8-pre Sanitized headers from net-next --- diff --git a/include/linux/atm.h b/include/linux/atm.h index 2fafdfb9a..08e27beba 100644 --- a/include/linux/atm.h +++ b/include/linux/atm.h @@ -8,8 +8,8 @@ * Instead, #include */ -#ifndef _UAPI_LINUX_ATM_H -#define _UAPI_LINUX_ATM_H +#ifndef _LINUX_ATM_H +#define _LINUX_ATM_H /* * BEGIN_xx and END_xx markers are used for automatic generation of @@ -238,4 +238,4 @@ struct atmif_sioc { typedef unsigned short atm_backend_t; -#endif /* _UAPI_LINUX_ATM_H */ +#endif /* _LINUX_ATM_H */ diff --git a/include/linux/genetlink.h b/include/linux/genetlink.h index c880a417d..1f85a2769 100644 --- a/include/linux/genetlink.h +++ b/include/linux/genetlink.h @@ -1,5 +1,5 @@ -#ifndef _UAPI__LINUX_GENERIC_NETLINK_H -#define _UAPI__LINUX_GENERIC_NETLINK_H +#ifndef __LINUX_GENERIC_NETLINK_H +#define __LINUX_GENERIC_NETLINK_H #include #include @@ -81,4 +81,4 @@ enum { #define CTRL_ATTR_MCAST_GRP_MAX (__CTRL_ATTR_MCAST_GRP_MAX - 1) -#endif /* _UAPI__LINUX_GENERIC_NETLINK_H */ +#endif /* __LINUX_GENERIC_NETLINK_H */ diff --git a/include/linux/hdlc/ioctl.h b/include/linux/hdlc/ioctl.h index 583972364..04bc0274a 100644 --- a/include/linux/hdlc/ioctl.h +++ b/include/linux/hdlc/ioctl.h @@ -34,13 +34,15 @@ #define LMI_CCITT 3 /* ITU-T Annex A */ #define LMI_CISCO 4 /* The "original" LMI, aka Gang of Four */ -typedef struct { +#ifndef __ASSEMBLY__ + +typedef struct { unsigned int clock_rate; /* bits per second */ unsigned int clock_type; /* internal, external, TX-internal etc. */ unsigned short loopback; } sync_serial_settings; /* V.35, V.24, X.21 */ -typedef struct { +typedef struct { unsigned int clock_rate; /* bits per second */ unsigned int clock_type; /* internal, external, TX-internal etc. */ unsigned short loopback; @@ -78,4 +80,5 @@ typedef struct { /* PPP doesn't need any info now - supply length = 0 to ioctl */ +#endif /* __ASSEMBLY__ */ #endif /* __HDLC_IOCTL_H__ */ diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h index 82c7d1bda..6a48d55af 100644 --- a/include/linux/if_arp.h +++ b/include/linux/if_arp.h @@ -20,8 +20,8 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ -#ifndef _UAPI_LINUX_IF_ARP_H -#define _UAPI_LINUX_IF_ARP_H +#ifndef _LINUX_IF_ARP_H +#define _LINUX_IF_ARP_H #include @@ -156,4 +156,4 @@ struct arphdr { }; -#endif /* _UAPI_LINUX_IF_ARP_H */ +#endif /* _LINUX_IF_ARP_H */ diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h index 0343e1f05..730410a8b 100644 --- a/include/linux/if_ether.h +++ b/include/linux/if_ether.h @@ -18,8 +18,8 @@ * 2 of the License, or (at your option) any later version. */ -#ifndef _UAPI_LINUX_IF_ETHER_H -#define _UAPI_LINUX_IF_ETHER_H +#ifndef _LINUX_IF_ETHER_H +#define _LINUX_IF_ETHER_H #include @@ -48,6 +48,7 @@ #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 */ @@ -132,4 +133,4 @@ struct ethhdr { } __attribute__((packed)); -#endif /* _UAPI_LINUX_IF_ETHER_H */ +#endif /* _LINUX_IF_ETHER_H */ diff --git a/include/linux/if_link.h b/include/linux/if_link.h index 012d95a53..8ca3afe7e 100644 --- a/include/linux/if_link.h +++ b/include/linux/if_link.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_IF_LINK_H -#define _UAPI_LINUX_IF_LINK_H +#ifndef _LINUX_IF_LINK_H +#define _LINUX_IF_LINK_H #include #include @@ -203,6 +203,24 @@ enum { #define IFLA_INET6_MAX (__IFLA_INET6_MAX - 1) +enum { + BRIDGE_MODE_UNSPEC, + BRIDGE_MODE_HAIRPIN, +}; + +enum { + IFLA_BRPORT_UNSPEC, + IFLA_BRPORT_STATE, /* Spanning tree state */ + IFLA_BRPORT_PRIORITY, /* " priority */ + IFLA_BRPORT_COST, /* " cost */ + IFLA_BRPORT_MODE, /* mode (hairpin) */ + IFLA_BRPORT_GUARD, /* bpdu guard */ + IFLA_BRPORT_PROTECT, /* root port protection */ + IFLA_BRPORT_FAST_LEAVE, /* multicast fast leave */ + __IFLA_BRPORT_MAX +}; +#define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1) + struct ifla_cacheinfo { __u32 max_reasm_len; __u32 tstamp; /* ipv6InterfaceTable updated timestamp */ @@ -283,6 +301,10 @@ enum { IFLA_VXLAN_AGEING, IFLA_VXLAN_LIMIT, IFLA_VXLAN_PORT_RANGE, + IFLA_VXLAN_PROXY, + IFLA_VXLAN_RSC, + IFLA_VXLAN_L2MISS, + IFLA_VXLAN_L3MISS, __IFLA_VXLAN_MAX }; #define IFLA_VXLAN_MAX (__IFLA_VXLAN_MAX - 1) @@ -424,4 +446,4 @@ enum { #define IFLA_IPOIB_MAX (__IFLA_IPOIB_MAX - 1) -#endif /* _UAPI_LINUX_IF_LINK_H */ +#endif /* _LINUX_IF_LINK_H */ diff --git a/include/linux/if_tun.h b/include/linux/if_tun.h index 25a585ce2..dffb19273 100644 --- a/include/linux/if_tun.h +++ b/include/linux/if_tun.h @@ -13,8 +13,8 @@ * GNU General Public License for more details. */ -#ifndef _UAPI__IF_TUN_H -#define _UAPI__IF_TUN_H +#ifndef __IF_TUN_H +#define __IF_TUN_H #include #include @@ -31,9 +31,11 @@ #define TUN_FASYNC 0x0010 #define TUN_NOCHECKSUM 0x0020 #define TUN_NO_PI 0x0040 +/* This flag has no real effect */ #define TUN_ONE_QUEUE 0x0080 #define TUN_PERSIST 0x0100 #define TUN_VNET_HDR 0x0200 +#define TUN_TAP_MQ 0x0400 /* Ioctl defines */ #define TUNSETNOCSUM _IOW('T', 200, int) @@ -53,14 +55,19 @@ #define TUNDETACHFILTER _IOW('T', 214, struct sock_fprog) #define TUNGETVNETHDRSZ _IOR('T', 215, int) #define TUNSETVNETHDRSZ _IOW('T', 216, int) +#define TUNSETQUEUE _IOW('T', 217, int) /* TUNSETIFF ifr flags */ #define IFF_TUN 0x0001 #define IFF_TAP 0x0002 #define IFF_NO_PI 0x1000 +/* This flag has no real effect */ #define IFF_ONE_QUEUE 0x2000 #define IFF_VNET_HDR 0x4000 #define IFF_TUN_EXCL 0x8000 +#define IFF_MULTI_QUEUE 0x0100 +#define IFF_ATTACH_QUEUE 0x0200 +#define IFF_DETACH_QUEUE 0x0400 /* Features for GSO (TUNSETOFFLOAD). */ #define TUN_F_CSUM 0x01 /* You can hand me unchecksummed packets. */ @@ -91,4 +98,4 @@ struct tun_filter { __u8 addr[0][ETH_ALEN]; }; -#endif /* _UAPI__IF_TUN_H */ +#endif /* __IF_TUN_H */ diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h index 5db594257..9f471ca1b 100644 --- a/include/linux/if_tunnel.h +++ b/include/linux/if_tunnel.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_IF_TUNNEL_H_ -#define _UAPI_IF_TUNNEL_H_ +#ifndef _IF_TUNNEL_H_ +#define _IF_TUNNEL_H_ #include #include @@ -37,6 +37,26 @@ struct ip_tunnel_parm { struct iphdr iph; }; +enum { + IFLA_IPTUN_UNSPEC, + IFLA_IPTUN_LINK, + IFLA_IPTUN_LOCAL, + IFLA_IPTUN_REMOTE, + IFLA_IPTUN_TTL, + IFLA_IPTUN_TOS, + IFLA_IPTUN_ENCAP_LIMIT, + IFLA_IPTUN_FLOWINFO, + IFLA_IPTUN_FLAGS, + IFLA_IPTUN_PROTO, + IFLA_IPTUN_PMTUDISC, + IFLA_IPTUN_6RD_PREFIX, + IFLA_IPTUN_6RD_RELAY_PREFIX, + IFLA_IPTUN_6RD_PREFIXLEN, + IFLA_IPTUN_6RD_RELAY_PREFIXLEN, + __IFLA_IPTUN_MAX, +}; +#define IFLA_IPTUN_MAX (__IFLA_IPTUN_MAX - 1) + /* SIT-mode i_flags */ #define SIT_ISATAP 0x0001 @@ -93,4 +113,4 @@ enum { }; #define IFLA_VTI_MAX (__IFLA_VTI_MAX - 1) -#endif /* _UAPI_IF_TUNNEL_H_ */ +#endif /* _IF_TUNNEL_H_ */ diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index 0744f8e65..3be1ca612 100644 --- a/include/linux/if_vlan.h +++ b/include/linux/if_vlan.h @@ -10,8 +10,8 @@ * */ -#ifndef _UAPI_LINUX_IF_VLAN_H_ -#define _UAPI_LINUX_IF_VLAN_H_ +#ifndef _LINUX_IF_VLAN_H_ +#define _LINUX_IF_VLAN_H_ /* VLAN IOCTLs are found in sockios.h */ @@ -60,4 +60,4 @@ struct vlan_ioctl_args { short vlan_qos; }; -#endif /* _UAPI_LINUX_IF_VLAN_H_ */ +#endif /* _LINUX_IF_VLAN_H_ */ diff --git a/include/linux/inet_diag.h b/include/linux/inet_diag.h index 8c469af93..e34f24774 100644 --- a/include/linux/inet_diag.h +++ b/include/linux/inet_diag.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_INET_DIAG_H_ -#define _UAPI_INET_DIAG_H_ +#ifndef _INET_DIAG_H_ +#define _INET_DIAG_H_ #include @@ -109,9 +109,10 @@ enum { INET_DIAG_TOS, INET_DIAG_TCLASS, INET_DIAG_SKMEMINFO, + INET_DIAG_SHUTDOWN, }; -#define INET_DIAG_MAX INET_DIAG_SKMEMINFO +#define INET_DIAG_MAX INET_DIAG_SHUTDOWN /* INET_DIAG_MEM */ @@ -133,4 +134,4 @@ struct tcpvegas_info { }; -#endif /* _UAPI_INET_DIAG_H_ */ +#endif /* _INET_DIAG_H_ */ diff --git a/include/linux/l2tp.h b/include/linux/l2tp.h index 02a567b36..c4bec8230 100644 --- a/include/linux/l2tp.h +++ b/include/linux/l2tp.h @@ -4,8 +4,8 @@ * Author: James Chapman */ -#ifndef _UAPI_LINUX_L2TP_H_ -#define _UAPI_LINUX_L2TP_H_ +#ifndef _LINUX_L2TP_H_ +#define _LINUX_L2TP_H_ #include #include @@ -175,4 +175,4 @@ enum l2tp_seqmode { #define L2TP_GENL_NAME "l2tp" #define L2TP_GENL_VERSION 0x1 -#endif /* _UAPI_LINUX_L2TP_H_ */ +#endif /* _LINUX_L2TP_H_ */ diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 6b9500bc2..adc726075 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -22,8 +22,8 @@ * * Moved to /usr/include/linux for NET3 */ -#ifndef _UAPI_LINUX_NETDEVICE_H -#define _UAPI_LINUX_NETDEVICE_H +#ifndef _LINUX_NETDEVICE_H +#define _LINUX_NETDEVICE_H #include #include @@ -50,4 +50,4 @@ enum { }; -#endif /* _UAPI_LINUX_NETDEVICE_H */ +#endif /* _LINUX_NETDEVICE_H */ diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h index 9961e7f6b..f05c3d92e 100644 --- a/include/linux/netfilter.h +++ b/include/linux/netfilter.h @@ -1,5 +1,5 @@ -#ifndef _UAPI__LINUX_NETFILTER_H -#define _UAPI__LINUX_NETFILTER_H +#ifndef __LINUX_NETFILTER_H +#define __LINUX_NETFILTER_H #include @@ -67,4 +67,4 @@ union nf_inet_addr { struct in6_addr in6; }; -#endif /* _UAPI__LINUX_NETFILTER_H */ +#endif /* __LINUX_NETFILTER_H */ diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h index 92a06f304..412097007 100644 --- a/include/linux/netfilter/x_tables.h +++ b/include/linux/netfilter/x_tables.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_X_TABLES_H -#define _UAPI_X_TABLES_H +#ifndef _X_TABLES_H +#define _X_TABLES_H #include #include @@ -182,4 +182,4 @@ struct xt_counters_info { (pos)->u.match_size)) -#endif /* _UAPI_X_TABLES_H */ +#endif /* _X_TABLES_H */ diff --git a/include/linux/netfilter_ipv4.h b/include/linux/netfilter_ipv4.h index 77a3e439d..a5f4dc784 100644 --- a/include/linux/netfilter_ipv4.h +++ b/include/linux/netfilter_ipv4.h @@ -1,8 +1,8 @@ /* IPv4-specific defines for netfilter. * (C)1998 Rusty Russell -- This code is GPL. */ -#ifndef _UAPI__LINUX_IP_NETFILTER_H -#define _UAPI__LINUX_IP_NETFILTER_H +#ifndef __LINUX_IP_NETFILTER_H +#define __LINUX_IP_NETFILTER_H #include @@ -76,4 +76,4 @@ enum nf_ip_hook_priorities { #define SO_ORIGINAL_DST 80 -#endif /* _UAPI__LINUX_IP_NETFILTER_H */ +#endif /* __LINUX_IP_NETFILTER_H */ diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h index 6ba9b0937..38542b4f7 100644 --- a/include/linux/netfilter_ipv4/ip_tables.h +++ b/include/linux/netfilter_ipv4/ip_tables.h @@ -12,8 +12,8 @@ * Port numbers are stored in HOST byte order. */ -#ifndef _UAPI_IPTABLES_H -#define _UAPI_IPTABLES_H +#ifndef _IPTABLES_H +#define _IPTABLES_H #include @@ -224,4 +224,4 @@ ipt_get_target(struct ipt_entry *e) /* * Main firewall chains definitions and global var's definitions. */ -#endif /* _UAPI_IPTABLES_H */ +#endif /* _IPTABLES_H */ diff --git a/include/linux/netlink.h b/include/linux/netlink.h index 78d5b8a54..ced0e1a7f 100644 --- a/include/linux/netlink.h +++ b/include/linux/netlink.h @@ -1,5 +1,5 @@ -#ifndef _UAPI__LINUX_NETLINK_H -#define _UAPI__LINUX_NETLINK_H +#ifndef __LINUX_NETLINK_H +#define __LINUX_NETLINK_H #include /* for __kernel_sa_family_t */ #include @@ -150,4 +150,4 @@ struct nlattr { #define NLA_HDRLEN ((int) NLA_ALIGN(sizeof(struct nlattr))) -#endif /* _UAPI__LINUX_NETLINK_H */ +#endif /* __LINUX_NETLINK_H */ diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index 0e3e0c17c..c82a159de 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h @@ -1,5 +1,5 @@ -#ifndef _UAPI__LINUX_RTNETLINK_H -#define _UAPI__LINUX_RTNETLINK_H +#ifndef __LINUX_RTNETLINK_H +#define __LINUX_RTNETLINK_H #include #include @@ -120,6 +120,14 @@ enum { RTM_SETDCB, #define RTM_SETDCB RTM_SETDCB + RTM_NEWNETCONF = 80, +#define RTM_NEWNETCONF RTM_NEWNETCONF + RTM_GETNETCONF = 82, +#define RTM_GETNETCONF RTM_GETNETCONF + + RTM_GETMDB = 86, +#define RTM_GETMDB RTM_GETMDB + __RTM_MAX, #define RTM_MAX (((__RTM_MAX + 3) & ~3) - 1) }; @@ -222,6 +230,7 @@ enum { #define RTPROT_XORP 14 /* XORP */ #define RTPROT_NTK 15 /* Netsukuku */ #define RTPROT_DHCP 16 /* DHCP client */ +#define RTPROT_MROUTED 17 /* Multicast daemon */ /* rtm_scope @@ -283,6 +292,7 @@ enum rtattr_type_t { RTA_MP_ALGO, /* no longer used */ RTA_TABLE, RTA_MARK, + RTA_MFC_STATS, __RTA_MAX }; @@ -403,6 +413,12 @@ struct rta_session { } u; }; +struct rta_mfc_stats { + __u64 mfcs_packets; + __u64 mfcs_bytes; + __u64 mfcs_wrong_if; +}; + /**** * General form of address family dependent message. ****/ @@ -585,6 +601,10 @@ enum rtnetlink_groups { #define RTNLGRP_PHONET_ROUTE RTNLGRP_PHONET_ROUTE RTNLGRP_DCB, #define RTNLGRP_DCB RTNLGRP_DCB + RTNLGRP_IPV4_NETCONF, +#define RTNLGRP_IPV4_NETCONF RTNLGRP_IPV4_NETCONF + RTNLGRP_IPV6_NETCONF, +#define RTNLGRP_IPV6_NETCONF RTNLGRP_IPV6_NETCONF __RTNLGRP_MAX }; #define RTNLGRP_MAX (__RTNLGRP_MAX - 1) @@ -607,4 +627,4 @@ struct tcamsg { -#endif /* _UAPI__LINUX_RTNETLINK_H */ +#endif /* __LINUX_RTNETLINK_H */ diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h index b00e29efb..78996e238 100644 --- a/include/linux/sock_diag.h +++ b/include/linux/sock_diag.h @@ -1,5 +1,5 @@ -#ifndef _UAPI__SOCK_DIAG_H__ -#define _UAPI__SOCK_DIAG_H__ +#ifndef __SOCK_DIAG_H__ +#define __SOCK_DIAG_H__ #include @@ -23,4 +23,4 @@ enum { SK_MEMINFO_VARS, }; -#endif /* _UAPI__SOCK_DIAG_H__ */ +#endif /* __SOCK_DIAG_H__ */ diff --git a/include/linux/socket.h b/include/linux/socket.h index 76ab0c685..8c1e50177 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_SOCKET_H -#define _UAPI_LINUX_SOCKET_H +#ifndef _LINUX_SOCKET_H +#define _LINUX_SOCKET_H /* * Desired design of maximum size and alignment (see RFC2553) @@ -18,4 +18,4 @@ struct __kernel_sockaddr_storage { /* _SS_MAXSIZE value minus size of ss_family */ } __attribute__ ((aligned(_K_SS_ALIGNSIZE))); /* force desired alignment */ -#endif /* _UAPI_LINUX_SOCKET_H */ +#endif /* _LINUX_SOCKET_H */ diff --git a/include/linux/types.h b/include/linux/types.h index 54c5df3d5..23ea78fd1 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_TYPES_H -#define _UAPI_LINUX_TYPES_H +#ifndef _LINUX_TYPES_H +#define _LINUX_TYPES_H #include @@ -48,4 +48,4 @@ typedef __u32 __bitwise __wsum; #define __aligned_le64 __le64 __attribute__((aligned(8))) #endif /* __ASSEMBLY__ */ -#endif /* _UAPI_LINUX_TYPES_H */ +#endif /* _LINUX_TYPES_H */ diff --git a/include/linux/unix_diag.h b/include/linux/unix_diag.h index b1d2bf16b..b8a24941d 100644 --- a/include/linux/unix_diag.h +++ b/include/linux/unix_diag.h @@ -37,6 +37,7 @@ enum { UNIX_DIAG_ICONS, UNIX_DIAG_RQLEN, UNIX_DIAG_MEMINFO, + UNIX_DIAG_SHUTDOWN, UNIX_DIAG_MAX, };