Update kernel headers to 3.7-rc1

Get new sanitized headers

include/linux/atm.h

@@ -8,8 +8,8 @@
  *          Instead, #include <atm.h>
  */
 
-#ifndef _LINUX_ATM_H
+#ifndef _UAPI_LINUX_ATM_H
-#define _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 */

include/linux/genetlink.h

@@ -1,5 +1,5 @@
-#ifndef __LINUX_GENERIC_NETLINK_H
+#ifndef _UAPI__LINUX_GENERIC_NETLINK_H
-#define __LINUX_GENERIC_NETLINK_H
+#define _UAPI__LINUX_GENERIC_NETLINK_H
 
 #include <linux/types.h>
 #include <linux/netlink.h>
@@ -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 */

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
+#ifndef _UAPI_LINUX_IF_ARP_H
-#define _LINUX_IF_ARP_H
+#define _UAPI_LINUX_IF_ARP_H
 
 #include <linux/netdevice.h>
 
@@ -156,4 +156,4 @@ struct arphdr {
 };
 
 
-#endif	/* _LINUX_IF_ARP_H */
+#endif /* _UAPI_LINUX_IF_ARP_H */

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
+#ifndef _UAPI_LINUX_IF_ETHER_H
-#define _LINUX_IF_ETHER_H
+#define _UAPI_LINUX_IF_ETHER_H
 
 #include <linux/types.h>
 
@@ -132,4 +132,4 @@ struct ethhdr {
 } __attribute__((packed));
 
 
-#endif	/* _LINUX_IF_ETHER_H */
+#endif /* _UAPI_LINUX_IF_ETHER_H */

include/linux/if_link.h

@@ -1,5 +1,5 @@
-#ifndef _LINUX_IF_LINK_H
+#ifndef _UAPI_LINUX_IF_LINK_H
-#define _LINUX_IF_LINK_H
+#define _UAPI_LINUX_IF_LINK_H
 
 #include <linux/types.h>
 #include <linux/netlink.h>
@@ -424,4 +424,4 @@ enum {
 
 #define IFLA_IPOIB_MAX (__IFLA_IPOIB_MAX - 1)
 
-#endif /* _LINUX_IF_LINK_H */
+#endif /* _UAPI_LINUX_IF_LINK_H */

include/linux/if_tun.h

@@ -13,8 +13,8 @@
  *  GNU General Public License for more details.
  */
 
-#ifndef __IF_TUN_H
+#ifndef _UAPI__IF_TUN_H
-#define __IF_TUN_H
+#define _UAPI__IF_TUN_H
 
 #include <linux/types.h>
 #include <linux/if_ether.h>
@@ -91,4 +91,4 @@ struct tun_filter {
 	__u8   addr[0][ETH_ALEN];
 };
 
-#endif /* __IF_TUN_H */
+#endif /* _UAPI__IF_TUN_H */

include/linux/if_tunnel.h

@@ -1,5 +1,5 @@
-#ifndef _IF_TUNNEL_H_
+#ifndef _UAPI_IF_TUNNEL_H_
-#define _IF_TUNNEL_H_
+#define _UAPI_IF_TUNNEL_H_
 
 #include <linux/types.h>
 #include <asm/byteorder.h>
@@ -93,4 +93,4 @@ enum {
 };
 
 #define IFLA_VTI_MAX	(__IFLA_VTI_MAX - 1)
-#endif /* _IF_TUNNEL_H_ */
+#endif /* _UAPI_IF_TUNNEL_H_ */

include/linux/if_vlan.h

@@ -10,8 +10,8 @@
  *
  */
 
-#ifndef _LINUX_IF_VLAN_H_
+#ifndef _UAPI_LINUX_IF_VLAN_H_
-#define _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_ */

include/linux/inet_diag.h

@@ -1,5 +1,5 @@
-#ifndef _INET_DIAG_H_
+#ifndef _UAPI_INET_DIAG_H_
-#define _INET_DIAG_H_ 1
+#define _UAPI_INET_DIAG_H_
 
 #include <linux/types.h>
 
@@ -133,4 +133,4 @@ struct tcpvegas_info {
 };
 
 
-#endif /* _INET_DIAG_H_ */
+#endif /* _UAPI_INET_DIAG_H_ */

include/linux/l2tp.h

@@ -4,8 +4,8 @@
  * Author: James Chapman <jchapman@katalix.com>
  */
 
-#ifndef _LINUX_L2TP_H_
+#ifndef _UAPI_LINUX_L2TP_H_
-#define _LINUX_L2TP_H_
+#define _UAPI_LINUX_L2TP_H_
 
 #include <linux/types.h>
 #include <linux/socket.h>
@@ -175,4 +175,4 @@ enum l2tp_seqmode {
 #define L2TP_GENL_NAME		"l2tp"
 #define L2TP_GENL_VERSION	0x1
 
-#endif
+#endif /* _UAPI_LINUX_L2TP_H_ */

include/linux/netdevice.h

@@ -22,8 +22,8 @@
  *
  *		Moved to /usr/include/linux for NET3
  */
-#ifndef _LINUX_NETDEVICE_H
+#ifndef _UAPI_LINUX_NETDEVICE_H
-#define _LINUX_NETDEVICE_H
+#define _UAPI_LINUX_NETDEVICE_H
 
 #include <linux/if.h>
 #include <linux/if_ether.h>
@@ -50,4 +50,4 @@ enum {
 };
 
 
-#endif	/* _LINUX_NETDEVICE_H */
+#endif /* _UAPI_LINUX_NETDEVICE_H */

include/linux/netfilter.h

@@ -1,10 +1,11 @@
-#ifndef __LINUX_NETFILTER_H
+#ifndef _UAPI__LINUX_NETFILTER_H
-#define __LINUX_NETFILTER_H
+#define _UAPI__LINUX_NETFILTER_H
 
 #include <linux/types.h>
 
 #include <linux/sysctl.h>
 
+
 /* 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 */

include/linux/netfilter/x_tables.h

@@ -1,5 +1,5 @@
-#ifndef _X_TABLES_H
+#ifndef _UAPI_X_TABLES_H
-#define _X_TABLES_H
+#define _UAPI_X_TABLES_H
 #include <linux/kernel.h>
 #include <linux/types.h>
 
@@ -182,4 +182,4 @@ struct xt_counters_info {
 	             (pos)->u.match_size))
 
 
-#endif /* _X_TABLES_H */
+#endif /* _UAPI_X_TABLES_H */

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 <linux/netfilter.h>
 
@@ -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 */

include/linux/netfilter_ipv4/ip_tables.h

@@ -12,8 +12,8 @@
  * 	Port numbers are stored in HOST byte order.
  */
 
-#ifndef _IPTABLES_H
+#ifndef _UAPI_IPTABLES_H
-#define _IPTABLES_H
+#define _UAPI_IPTABLES_H
 
 #include <linux/types.h>
 
@@ -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 */

include/linux/netlink.h

@@ -1,5 +1,5 @@
-#ifndef __LINUX_NETLINK_H
+#ifndef _UAPI__LINUX_NETLINK_H
-#define __LINUX_NETLINK_H
+#define _UAPI__LINUX_NETLINK_H
 
 #include <linux/socket.h> /* for __kernel_sa_family_t */
 #include <linux/types.h>
@@ -150,4 +150,4 @@ struct nlattr {
 #define NLA_HDRLEN		((int) NLA_ALIGN(sizeof(struct nlattr)))
 
 
-#endif	/* __LINUX_NETLINK_H */
+#endif /* _UAPI__LINUX_NETLINK_H */

include/linux/rtnetlink.h

@@ -1,5 +1,5 @@
-#ifndef __LINUX_RTNETLINK_H
+#ifndef _UAPI__LINUX_RTNETLINK_H
-#define __LINUX_RTNETLINK_H
+#define _UAPI__LINUX_RTNETLINK_H
 
 #include <linux/types.h>
 #include <linux/netlink.h>
@@ -607,4 +607,4 @@ struct tcamsg {
 
 
 
-#endif	/* __LINUX_RTNETLINK_H */
+#endif /* _UAPI__LINUX_RTNETLINK_H */

include/linux/sock_diag.h

@@ -1,5 +1,5 @@
-#ifndef __SOCK_DIAG_H__
+#ifndef _UAPI__SOCK_DIAG_H__
-#define __SOCK_DIAG_H__
+#define _UAPI__SOCK_DIAG_H__
 
 #include <linux/types.h>
 
@@ -23,4 +23,4 @@ enum {
 	SK_MEMINFO_VARS,
 };
 
-#endif
+#endif /* _UAPI__SOCK_DIAG_H__ */

include/linux/socket.h

@@ -1,5 +1,5 @@
-#ifndef _LINUX_SOCKET_H
+#ifndef _UAPI_LINUX_SOCKET_H
-#define _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 */

include/linux/types.h

@@ -1,5 +1,5 @@
-#ifndef _LINUX_TYPES_H
+#ifndef _UAPI_LINUX_TYPES_H
-#define _LINUX_TYPES_H
+#define _UAPI_LINUX_TYPES_H
 
 #include <asm/types.h>
 
@@ -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 */