fbdev: move FBIO_WAITFORVSYNC to linux/fb.h

[safe/jmp/linux-2.6] / include / linux / errqueue.h

diff --git a/include/linux/errqueue.h b/include/linux/errqueue.h
index 408118a..034072c 100644 (file)
--- a/include/linux/errqueue.h
+++ b/include/linux/errqueue.h
@@ -1,8 +1,9 @@
 #ifndef _LINUX_ERRQUEUE_H
 #define _LINUX_ERRQUEUE_H 1
 
-struct sock_extended_err
-{
+#include <linux/types.h>
+
+struct sock_extended_err {
        __u32   ee_errno;       
        __u8    ee_origin;
        __u8    ee_type;
@@ -16,6 +17,7 @@ struct sock_extended_err
 #define SO_EE_ORIGIN_LOCAL     1
 #define SO_EE_ORIGIN_ICMP      2
 #define SO_EE_ORIGIN_ICMP6     3
+#define SO_EE_ORIGIN_TIMESTAMPING 4
 
 #define SO_EE_OFFENDER(ee)     ((struct sockaddr*)((ee)+1))
 
@@ -28,8 +30,7 @@ struct sock_extended_err
 
 #define SKB_EXT_ERR(skb) ((struct sock_exterr_skb *) ((skb)->cb))
 
-struct sock_exterr_skb
-{
+struct sock_exterr_skb {
        union {
                struct inet_skb_parm    h4;
 #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
@@ -38,7 +39,7 @@ struct sock_exterr_skb
        } header;
        struct sock_extended_err        ee;
        u16                             addr_offset;
-       u16                             port;
+       __be16                          port;
 };
 
 #endif