diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-12 12:59:05 +0000 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-12 12:59:05 +0000 |
commit | 163849ea9b4c5d50fbd324692461983d18faadad (patch) | |
tree | 7176a18fea53560eb4092aa103d94a266ab4e60d /include/linux/dn.h | |
parent | 2138301e1687bd4f22aa2b4df4829b6ffdae19bc (diff) | |
parent | 5ee518ecbcb5934e284ea51a19a939c891f5f7ea (diff) |
Merge branch 'for-2.6.33' into for-2.6.34
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 fe999082319..9c50445462d 100644 --- a/include/linux/dn.h +++ b/include/linux/dn.h @@ -71,14 +71,12 @@ /* Structures */ -struct dn_naddr -{ +struct dn_naddr { __le16 a_len; __u8 a_addr[DN_MAXADDL]; /* Two bytes little endian */ }; -struct sockaddr_dn -{ +struct sockaddr_dn { __u16 sdn_family; __u8 sdn_flags; __u8 sdn_objnum; @@ -101,8 +99,7 @@ struct optdata_dn { __u8 opt_data[16]; /* User data */ }; -struct accessdata_dn -{ +struct accessdata_dn { __u8 acc_accl; __u8 acc_acc[DN_MAXACCL]; __u8 acc_passl; |