Update kernel headers to 3.7-rc1

Get new sanitized headers

diff --git a/include/linux/atm.h b/include/linux/atm.h
index 5e1c36d1c281ec3ca104677fa3ba561fcc3ece90..2fafdfb9aa8100b530b4560cde24428ed37a4f6e 100644 (file)
--- a/include/linux/atm.h
+++ b/include/linux/atm.h
@@ -8,8 +8,8 @@
  *          Instead, #include <atm.h>
  */
 
-#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 55ce7bbb6a6ef18373adba5bbe2f8c381ba92065..c880a417d8a93693874b76a3e364a203ed4d0a9c 100644 (file)
--- 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 <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 */

diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h
index 1c4e8dcf00827745f551157b6e199b0a2d306a38..82c7d1bdadeb3d853ad4e33e51bc3fa8962c7d82 100644 (file)
--- 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 <linux/netdevice.h>
 
@@ -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 9772d4e23bfaca8eb8cf4eed269995bb85559173..0343e1f0582c01bcd54425bbb551098951d3767b 100644 (file)
--- 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 <linux/types.h>
 
@@ -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 563e8fb947c0604990a129e1aa659ac1792b3ac8..012d95a53128df6a40cb87e3af486ff5d0dc4b00 100644 (file)
--- 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 <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 */

diff --git a/include/linux/if_tun.h b/include/linux/if_tun.h
index 4054c1acf58ade3f07322b740774955eb3094a6e..25a585ce23e68243e1f0a1610f240624aaef6bde 100644 (file)
--- 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 <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 */

diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h
index 70c33fa52d44b06cbb151fa1c9e764ae555c5df4..5db5942575fe9781f4e06bdb89f6f1e86e1dfb5f 100644 (file)
--- 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 <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_ */

diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index 5b808eb8882b8c18c56f35d501be26663477fce5..0744f8e65d1599ef4764af2947d1f61440355163 100644 (file)
--- 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 7e312383ec4f15052c94c3f2b576ff6ef17ef791..8c469af939aab33a2117d7361e247371c6303750 100644 (file)
--- 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 <linux/types.h>
 
@@ -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 357bb951181a483b2d018fb9fa65008a7f9adef4..02a567b36ec04502575ef39880e43226d806a4a6 100644 (file)
--- a/include/linux/l2tp.h
+++ b/include/linux/l2tp.h
@@ -4,8 +4,8 @@
  * Author: James Chapman <jchapman@katalix.com>
  */
 
-#ifndef _LINUX_L2TP_H_
-#define _LINUX_L2TP_H_
+#ifndef _UAPI_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_ */

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 6c10e02a3c9cbd1b8273d14dc9d4610f3e8749c5..6b9500bc2d56a0338b39dbf1b46540edc6ffe141 100644 (file)
--- 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 <linux/if.h>
 #include <linux/if_ether.h>
@@ -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 54771312ff0743ab6f34f16231a18ad112ad01aa..9961e7f6b67749310bc797abcdaec141a4f1b5c6 100644 (file)
--- 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 <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 */

diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h
index 4120970072771786b50469e5b40d5f65bda9883c..92a06f3044a371811f1ff450718d54c00baaa1fa 100644 (file)
--- 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 <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 */

diff --git a/include/linux/netfilter_ipv4.h b/include/linux/netfilter_ipv4.h
index 86658f6c0c4a5539e14b1f3c0e1ec13d76f5bd9b..77a3e439dc8534b843f977730d50c7c933ac894a 100644 (file)
--- 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 <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 */

diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h
index 38542b4f721c0b45d62ff14d27fad502523b640c..6ba9b09379f5d50d9918118bfd1afcac57cb6a08 100644 (file)
--- 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 <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 */

diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index 830923b7e53a33fd4558dc3a95579d881f69aa43..78d5b8a546d63fb73cf45a2ab08a48ce02486dba 100644 (file)
--- 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 <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 */

diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index d5b7fddf38359c4cff87a53df096d1ada5018769..0e3e0c17ce9eebcbbf708ca461ab28c3384b1655 100644 (file)
--- 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 <linux/types.h>
 #include <linux/netlink.h>
@@ -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 ac9db193635553a1eca031c5b19ec81403152483..b00e29efb1619bb1943e7aa7062bb64c10f8b995 100644 (file)
--- 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 <linux/types.h>
 
@@ -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 8c1e5017741d1e7dff44fcfe4d02c20f1851004e..76ab0c68561eded34764c2bb29cbdf0c39292320 100644 (file)
--- 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 23ea78fd1847aa7a04d718321a2270e80b3dc0a6..54c5df3d5e625db0a22b1e1995cdfc46905e5e8e 100644 (file)
--- 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 <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 */