diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-13 11:35:09 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-13 11:35:09 -0500 |
| commit | bc7ecbcbc2c0ff235382077b55de7896775afc16 (patch) | |
| tree | 9918b2f3fdeebd9c99a308af94d86bc13c80d0c8 /include/linux/errqueue.h | |
| parent | c52854018ad123c9ef83867462457b75bb56d452 (diff) | |
| parent | 285eae0a4ba0f467341476fd4c6981e5cdafc6be (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Diffstat (limited to 'include/linux/errqueue.h')
| -rw-r--r-- | include/linux/errqueue.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/errqueue.h b/include/linux/errqueue.h index ec12cc74366f..034072cea853 100644 --- a/include/linux/errqueue.h +++ b/include/linux/errqueue.h | |||
| @@ -3,8 +3,7 @@ | |||
| 3 | 3 | ||
| 4 | #include <linux/types.h> | 4 | #include <linux/types.h> |
| 5 | 5 | ||
| 6 | struct sock_extended_err | 6 | struct sock_extended_err { |
| 7 | { | ||
| 8 | __u32 ee_errno; | 7 | __u32 ee_errno; |
| 9 | __u8 ee_origin; | 8 | __u8 ee_origin; |
| 10 | __u8 ee_type; | 9 | __u8 ee_type; |
| @@ -31,8 +30,7 @@ struct sock_extended_err | |||
| 31 | 30 | ||
| 32 | #define SKB_EXT_ERR(skb) ((struct sock_exterr_skb *) ((skb)->cb)) | 31 | #define SKB_EXT_ERR(skb) ((struct sock_exterr_skb *) ((skb)->cb)) |
| 33 | 32 | ||
| 34 | struct sock_exterr_skb | 33 | struct sock_exterr_skb { |
| 35 | { | ||
| 36 | union { | 34 | union { |
| 37 | struct inet_skb_parm h4; | 35 | struct inet_skb_parm h4; |
| 38 | #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) | 36 | #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) |