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/dn.h | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'include/linux/dn.h')
| -rw-r--r-- | include/linux/dn.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/include/linux/dn.h b/include/linux/dn.h index fe9990823193..9c50445462d9 100644 --- a/include/linux/dn.h +++ b/include/linux/dn.h | |||
| @@ -71,14 +71,12 @@ | |||
| 71 | /* Structures */ | 71 | /* Structures */ |
| 72 | 72 | ||
| 73 | 73 | ||
| 74 | struct dn_naddr | 74 | struct dn_naddr { |
| 75 | { | ||
| 76 | __le16 a_len; | 75 | __le16 a_len; |
| 77 | __u8 a_addr[DN_MAXADDL]; /* Two bytes little endian */ | 76 | __u8 a_addr[DN_MAXADDL]; /* Two bytes little endian */ |
| 78 | }; | 77 | }; |
| 79 | 78 | ||
| 80 | struct sockaddr_dn | 79 | struct sockaddr_dn { |
| 81 | { | ||
| 82 | __u16 sdn_family; | 80 | __u16 sdn_family; |
| 83 | __u8 sdn_flags; | 81 | __u8 sdn_flags; |
| 84 | __u8 sdn_objnum; | 82 | __u8 sdn_objnum; |
| @@ -101,8 +99,7 @@ struct optdata_dn { | |||
| 101 | __u8 opt_data[16]; /* User data */ | 99 | __u8 opt_data[16]; /* User data */ |
| 102 | }; | 100 | }; |
| 103 | 101 | ||
| 104 | struct accessdata_dn | 102 | struct accessdata_dn { |
| 105 | { | ||
| 106 | __u8 acc_accl; | 103 | __u8 acc_accl; |
| 107 | __u8 acc_acc[DN_MAXACCL]; | 104 | __u8 acc_acc[DN_MAXACCL]; |
| 108 | __u8 acc_passl; | 105 | __u8 acc_passl; |