From e95c8fc3b1321c9af3561b5e438b941e4574e46c Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 19 Oct 2012 13:31:05 -0700 Subject: [PATCH] Update kernel headers to 3.7-rc1 Get new sanitized headers --- include/linux/atm.h | 6 +++--- include/linux/genetlink.h | 6 +++--- include/linux/if_arp.h | 6 +++--- include/linux/if_ether.h | 6 +++--- include/linux/if_link.h | 6 +++--- include/linux/if_tun.h | 6 +++--- include/linux/if_tunnel.h | 6 +++--- include/linux/if_vlan.h | 6 +++--- include/linux/inet_diag.h | 6 +++--- include/linux/l2tp.h | 6 +++--- include/linux/netdevice.h | 6 +++--- include/linux/netfilter.h | 7 ++++--- include/linux/netfilter/x_tables.h | 6 +++--- include/linux/netfilter_ipv4.h | 8 ++++---- include/linux/netfilter_ipv4/ip_tables.h | 6 +++--- include/linux/netlink.h | 6 +++--- include/linux/rtnetlink.h | 6 +++--- include/linux/sock_diag.h | 6 +++--- include/linux/socket.h | 6 +++--- include/linux/types.h | 6 +++--- 20 files changed, 62 insertions(+), 61 deletions(-) diff --git a/include/linux/atm.h b/include/linux/atm.h index 5e1c36d1c..2fafdfb9a 100644 --- a/include/linux/atm.h +++ b/include/linux/atm.h @@ -8,8 +8,8 @@ * Instead, #include */ -#ifndef _LINUX_ATM_H -#define _LINUX_ATM_H +#ifndef _UAPI_LINUX_ATM_H +#define _UAPI_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 +#endif /* _UAPI_LINUX_ATM_H */ diff --git a/include/linux/genetlink.h b/include/linux/genetlink.h index 55ce7bbb6..c880a417d 100644 --- a/include/linux/genetlink.h +++ b/include/linux/genetlink.h @@ -1,5 +1,5 @@ -#ifndef __LINUX_GENERIC_NETLINK_H -#define __LINUX_GENERIC_NETLINK_H +#ifndef _UAPI__LINUX_GENERIC_NETLINK_H +#define _UAPI__LINUX_GENERIC_NETLINK_H #include #include @@ -81,4 +81,4 @@ enum { #define CTRL_ATTR_MCAST_GRP_MAX (__CTRL_ATTR_MCAST_GRP_MAX - 1) -#endif /* __LINUX_GENERIC_NETLINK_H */ +#endif /* _UAPI__LINUX_GENERIC_NETLINK_H */ diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h index 1c4e8dcf0..82c7d1bda 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 _LINUX_IF_ARP_H -#define _LINUX_IF_ARP_H +#ifndef _UAPI_LINUX_IF_ARP_H +#define _UAPI_LINUX_IF_ARP_H #include @@ -156,4 +156,4 @@ struct arphdr { }; -#endif /* _LINUX_IF_ARP_H */ +#endif /* _UAPI_LINUX_IF_ARP_H */ diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h index 9772d4e23..0343e1f05 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 _LINUX_IF_ETHER_H -#define _LINUX_IF_ETHER_H +#ifndef _UAPI_LINUX_IF_ETHER_H +#define _UAPI_LINUX_IF_ETHER_H #include @@ -132,4 +132,4 @@ struct ethhdr { } __attribute__((packed)); -#endif /* _LINUX_IF_ETHER_H */ +#endif /* _UAPI_LINUX_IF_ETHER_H */ diff --git a/include/linux/if_link.h b/include/linux/if_link.h index 563e8fb94..012d95a53 100644 --- a/include/linux/if_link.h +++ b/include/linux/if_link.h @@ -1,5 +1,5 @@ -#ifndef _LINUX_IF_LINK_H -#define _LINUX_IF_LINK_H +#ifndef _UAPI_LINUX_IF_LINK_H +#define _UAPI_LINUX_IF_LINK_H #include #include @@ -424,4 +424,4 @@ enum { #define IFLA_IPOIB_MAX (__IFLA_IPOIB_MAX - 1) -#endif /* _LINUX_IF_LINK_H */ +#endif /* _UAPI_LINUX_IF_LINK_H */ diff --git a/include/linux/if_tun.h b/include/linux/if_tun.h index 4054c1acf..25a585ce2 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 __IF_TUN_H -#define __IF_TUN_H +#ifndef _UAPI__IF_TUN_H +#define _UAPI__IF_TUN_H #include #include @@ -91,4 +91,4 @@ struct tun_filter { __u8 addr[0][ETH_ALEN]; }; -#endif /* __IF_TUN_H */ +#endif /* _UAPI__IF_TUN_H */ diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h index 70c33fa52..5db594257 100644 --- a/include/linux/if_tunnel.h +++ b/include/linux/if_tunnel.h @@ -1,5 +1,5 @@ -#ifndef _IF_TUNNEL_H_ -#define _IF_TUNNEL_H_ +#ifndef _UAPI_IF_TUNNEL_H_ +#define _UAPI_IF_TUNNEL_H_ #include #include @@ -93,4 +93,4 @@ enum { }; #define IFLA_VTI_MAX (__IFLA_VTI_MAX - 1) -#endif /* _IF_TUNNEL_H_ */ +#endif /* _UAPI_IF_TUNNEL_H_ */ diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index 5b808eb88..0744f8e65 100644 --- a/include/linux/if_vlan.h +++ b/include/linux/if_vlan.h @@ -10,8 +10,8 @@ * */ -#ifndef _LINUX_IF_VLAN_H_ -#define _LINUX_IF_VLAN_H_ +#ifndef _UAPI_LINUX_IF_VLAN_H_ +#define _UAPI_LINUX_IF_VLAN_H_ /* VLAN IOCTLs are found in sockios.h */ @@ -60,4 +60,4 @@ struct vlan_ioctl_args { short vlan_qos; }; -#endif /* !(_LINUX_IF_VLAN_H_) */ +#endif /* _UAPI_LINUX_IF_VLAN_H_ */ diff --git a/include/linux/inet_diag.h b/include/linux/inet_diag.h index 7e312383e..8c469af93 100644 --- a/include/linux/inet_diag.h +++ b/include/linux/inet_diag.h @@ -1,5 +1,5 @@ -#ifndef _INET_DIAG_H_ -#define _INET_DIAG_H_ 1 +#ifndef _UAPI_INET_DIAG_H_ +#define _UAPI_INET_DIAG_H_ #include @@ -133,4 +133,4 @@ struct tcpvegas_info { }; -#endif /* _INET_DIAG_H_ */ +#endif /* _UAPI_INET_DIAG_H_ */ diff --git a/include/linux/l2tp.h b/include/linux/l2tp.h index 357bb9511..02a567b36 100644 --- a/include/linux/l2tp.h +++ b/include/linux/l2tp.h @@ -4,8 +4,8 @@ * Author: James Chapman */ -#ifndef _LINUX_L2TP_H_ -#define _LINUX_L2TP_H_ +#ifndef _UAPI_LINUX_L2TP_H_ +#define _UAPI_LINUX_L2TP_H_ #include #include @@ -175,4 +175,4 @@ enum l2tp_seqmode { #define L2TP_GENL_NAME "l2tp" #define L2TP_GENL_VERSION 0x1 -#endif +#endif /* _UAPI_LINUX_L2TP_H_ */ diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 6c10e02a3..6b9500bc2 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -22,8 +22,8 @@ * * Moved to /usr/include/linux for NET3 */ -#ifndef _LINUX_NETDEVICE_H -#define _LINUX_NETDEVICE_H +#ifndef _UAPI_LINUX_NETDEVICE_H +#define _UAPI_LINUX_NETDEVICE_H #include #include @@ -50,4 +50,4 @@ enum { }; -#endif /* _LINUX_NETDEVICE_H */ +#endif /* _UAPI_LINUX_NETDEVICE_H */ diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h index 54771312f..9961e7f6b 100644 --- a/include/linux/netfilter.h +++ b/include/linux/netfilter.h @@ -1,10 +1,11 @@ -#ifndef __LINUX_NETFILTER_H -#define __LINUX_NETFILTER_H +#ifndef _UAPI__LINUX_NETFILTER_H +#define _UAPI__LINUX_NETFILTER_H #include #include + /* Responses from hook functions. */ #define NF_DROP 0 #define NF_ACCEPT 1 @@ -66,4 +67,4 @@ union nf_inet_addr { struct in6_addr in6; }; -#endif /*__LINUX_NETFILTER_H*/ +#endif /* _UAPI__LINUX_NETFILTER_H */ diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h index 412097007..92a06f304 100644 --- a/include/linux/netfilter/x_tables.h +++ b/include/linux/netfilter/x_tables.h @@ -1,5 +1,5 @@ -#ifndef _X_TABLES_H -#define _X_TABLES_H +#ifndef _UAPI_X_TABLES_H +#define _UAPI_X_TABLES_H #include #include @@ -182,4 +182,4 @@ struct xt_counters_info { (pos)->u.match_size)) -#endif /* _X_TABLES_H */ +#endif /* _UAPI_X_TABLES_H */ diff --git a/include/linux/netfilter_ipv4.h b/include/linux/netfilter_ipv4.h index 86658f6c0..77a3e439d 100644 --- a/include/linux/netfilter_ipv4.h +++ b/include/linux/netfilter_ipv4.h @@ -1,9 +1,9 @@ -#ifndef __LINUX_IP_NETFILTER_H -#define __LINUX_IP_NETFILTER_H - /* 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 + #include @@ -76,4 +76,4 @@ enum nf_ip_hook_priorities { #define SO_ORIGINAL_DST 80 -#endif /*__LINUX_IP_NETFILTER_H*/ +#endif /* _UAPI__LINUX_IP_NETFILTER_H */ diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h index 38542b4f7..6ba9b0937 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 _IPTABLES_H -#define _IPTABLES_H +#ifndef _UAPI_IPTABLES_H +#define _UAPI_IPTABLES_H #include @@ -224,4 +224,4 @@ ipt_get_target(struct ipt_entry *e) /* * Main firewall chains definitions and global var's definitions. */ -#endif /* _IPTABLES_H */ +#endif /* _UAPI_IPTABLES_H */ diff --git a/include/linux/netlink.h b/include/linux/netlink.h index 830923b7e..78d5b8a54 100644 --- a/include/linux/netlink.h +++ b/include/linux/netlink.h @@ -1,5 +1,5 @@ -#ifndef __LINUX_NETLINK_H -#define __LINUX_NETLINK_H +#ifndef _UAPI__LINUX_NETLINK_H +#define _UAPI__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 /* __LINUX_NETLINK_H */ +#endif /* _UAPI__LINUX_NETLINK_H */ diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index d5b7fddf3..0e3e0c17c 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h @@ -1,5 +1,5 @@ -#ifndef __LINUX_RTNETLINK_H -#define __LINUX_RTNETLINK_H +#ifndef _UAPI__LINUX_RTNETLINK_H +#define _UAPI__LINUX_RTNETLINK_H #include #include @@ -607,4 +607,4 @@ struct tcamsg { -#endif /* __LINUX_RTNETLINK_H */ +#endif /* _UAPI__LINUX_RTNETLINK_H */ diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h index ac9db1936..b00e29efb 100644 --- a/include/linux/sock_diag.h +++ b/include/linux/sock_diag.h @@ -1,5 +1,5 @@ -#ifndef __SOCK_DIAG_H__ -#define __SOCK_DIAG_H__ +#ifndef _UAPI__SOCK_DIAG_H__ +#define _UAPI__SOCK_DIAG_H__ #include @@ -23,4 +23,4 @@ enum { SK_MEMINFO_VARS, }; -#endif +#endif /* _UAPI__SOCK_DIAG_H__ */ diff --git a/include/linux/socket.h b/include/linux/socket.h index 8c1e50177..76ab0c685 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -1,5 +1,5 @@ -#ifndef _LINUX_SOCKET_H -#define _LINUX_SOCKET_H +#ifndef _UAPI_LINUX_SOCKET_H +#define _UAPI_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 /* _LINUX_SOCKET_H */ +#endif /* _UAPI_LINUX_SOCKET_H */ diff --git a/include/linux/types.h b/include/linux/types.h index 23ea78fd1..54c5df3d5 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -1,5 +1,5 @@ -#ifndef _LINUX_TYPES_H -#define _LINUX_TYPES_H +#ifndef _UAPI_LINUX_TYPES_H +#define _UAPI_LINUX_TYPES_H #include @@ -48,4 +48,4 @@ typedef __u32 __bitwise __wsum; #define __aligned_le64 __le64 __attribute__((aligned(8))) #endif /* __ASSEMBLY__ */ -#endif /* _LINUX_TYPES_H */ +#endif /* _UAPI_LINUX_TYPES_H */ -- 2.47.2