Update to 2.6.36 headers

Use santized headers from 2.6.36 release

diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
index 5d07e969e07b5001d3868fb7ae81d8ca849e94b7..7e275c44603755a018dda019c747776bca47dbf4 100644 (file)
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
@@ -119,7 +119,7 @@ struct ethhdr {
        unsigned char   h_dest[ETH_ALEN];       /* destination eth addr */
        unsigned char   h_source[ETH_ALEN];     /* source ether addr    */
        __be16          h_proto;                /* packet type ID field */
-} __packed;
+} __attribute__((packed));
 
 
 #endif /* _LINUX_IF_ETHER_H */

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 77c288a780c146828d90fbe9259d09d48c82f1fc..bec4e23f4607fa6cfc198fd91fdcd04873efccfb 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -34,36 +34,6 @@
 #define MAX_ADDR_LEN   32              /* Largest hardware address length */
 
 
-/*
- *     Old network device statistics. Fields are native words
- *     (unsigned long) so they can be read and written atomically.
- */
-
-struct net_device_stats {
-       unsigned long   rx_packets;
-       unsigned long   tx_packets;
-       unsigned long   rx_bytes;
-       unsigned long   tx_bytes;
-       unsigned long   rx_errors;
-       unsigned long   tx_errors;
-       unsigned long   rx_dropped;
-       unsigned long   tx_dropped;
-       unsigned long   multicast;
-       unsigned long   collisions;
-       unsigned long   rx_length_errors;
-       unsigned long   rx_over_errors;
-       unsigned long   rx_crc_errors;
-       unsigned long   rx_frame_errors;
-       unsigned long   rx_fifo_errors;
-       unsigned long   rx_missed_errors;
-       unsigned long   tx_aborted_errors;
-       unsigned long   tx_carrier_errors;
-       unsigned long   tx_fifo_errors;
-       unsigned long   tx_heartbeat_errors;
-       unsigned long   tx_window_errors;
-       unsigned long   rx_compressed;
-       unsigned long   tx_compressed;
-};
 
 /* Media selection options. */
 enum {

diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index 958b7f809fe1b5c0c4a9734fa58bee3936281c50..eed51b063f35f58c06072e4f6989f8fac458a177 100644 (file)
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -27,8 +27,6 @@
 
 #define MAX_LINKS 32           
 
-struct net;
-
 struct sockaddr_nl {
        sa_family_t     nl_family;      /* AF_NETLINK   */
        unsigned short  nl_pad;         /* zero         */

diff --git a/include/linux/tc_ematch/tc_em_text.h b/include/linux/tc_ematch/tc_em_text.h
new file mode 100644 (file)
index 0000000..5aac404
--- /dev/null
+++ b/include/linux/tc_ematch/tc_em_text.h
@@ -0,0 +1,19 @@
+#ifndef __LINUX_TC_EM_TEXT_H
+#define __LINUX_TC_EM_TEXT_H
+
+#include <linux/types.h>
+#include <linux/pkt_cls.h>
+
+#define TC_EM_TEXT_ALGOSIZ     16
+
+struct tcf_em_text {
+       char            algo[TC_EM_TEXT_ALGOSIZ];
+       __u16           from_offset;
+       __u16           to_offset;
+       __u16           pattern_len;
+       __u8            from_layer:4;
+       __u8            to_layer:4;
+       __u8            pad;
+};
+
+#endif

diff --git a/include/linux/types.h b/include/linux/types.h
index 8b483c80aeeb2b4c5670a1bea084cffd47d46c37..1bf5e5abec9427e394c6ce41e808dbcee7ddf705 100644 (file)
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -34,5 +34,10 @@ typedef __u64 __bitwise __be64;
 typedef __u16 __bitwise __sum16;
 typedef __u32 __bitwise __wsum;
 
+/* this is a special 64bit data type that is 8-byte aligned */
+#define __aligned_u64 __u64 __attribute__((aligned(8)))
+#define __aligned_be64 __be64 __attribute__((aligned(8)))
+#define __aligned_le64 __le64 __attribute__((aligned(8)))
+
 #endif /*  __ASSEMBLY__ */
 #endif /* _LINUX_TYPES_H */