diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /include/linux/errqueue.h | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
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) |