diff options
| author | James Morris <james.l.morris@oracle.com> | 2013-01-07 12:06:43 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2013-01-07 12:06:43 +1100 |
| commit | cf9ce948f47640797bd19980e1d99c6d17d0bdc3 (patch) | |
| tree | 97ce168cf32ac88b9aa93408b0b681747416a504 /include/linux/errqueue.h | |
| parent | e93072374112db9dc86635934ee761249be28370 (diff) | |
| parent | d1c3ed669a2d452cacfb48c2d171a1f364dae2ed (diff) | |
Merge tag 'v3.8-rc2' into next
Sync to Linus' tree.
Linux 3.8-rc2
Diffstat (limited to 'include/linux/errqueue.h')
| -rw-r--r-- | include/linux/errqueue.h | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/include/linux/errqueue.h b/include/linux/errqueue.h index fd0628be45ce..9ca23fcfb5d7 100644 --- a/include/linux/errqueue.h +++ b/include/linux/errqueue.h @@ -1,33 +1,12 @@ #ifndef _LINUX_ERRQUEUE_H #define _LINUX_ERRQUEUE_H 1 -#include <linux/types.h> - -struct sock_extended_err { - __u32 ee_errno; - __u8 ee_origin; - __u8 ee_type; - __u8 ee_code; - __u8 ee_pad; - __u32 ee_info; - __u32 ee_data; -}; - -#define SO_EE_ORIGIN_NONE 0 -#define SO_EE_ORIGIN_LOCAL 1 -#define SO_EE_ORIGIN_ICMP 2 -#define SO_EE_ORIGIN_ICMP6 3 -#define SO_EE_ORIGIN_TXSTATUS 4 -#define SO_EE_ORIGIN_TIMESTAMPING SO_EE_ORIGIN_TXSTATUS - -#define SO_EE_OFFENDER(ee) ((struct sockaddr*)((ee)+1)) - -#ifdef __KERNEL__ #include <net/ip.h> #if IS_ENABLED(CONFIG_IPV6) #include <linux/ipv6.h> #endif +#include <uapi/linux/errqueue.h> #define SKB_EXT_ERR(skb) ((struct sock_exterr_skb *) ((skb)->cb)) @@ -44,5 +23,3 @@ struct sock_exterr_skb { }; #endif - -#endif |