diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
| commit | 709334c87dbdb44150ce436b3d13c814db0dcae9 (patch) | |
| tree | 5861a45f70c1f283720337abd864498f5afb3dbe /include/linux/if_ec.h | |
| parent | 0d64b568fcd48b133721c1d322e7c51d85eb12df (diff) | |
| parent | f74890277a196949e4004fe2955e1d4fb3930f98 (diff) | |
Merge branch 'fixes' of git://git.alsa-project.org/alsa-kernel into for-linus
Diffstat (limited to 'include/linux/if_ec.h')
| -rw-r--r-- | include/linux/if_ec.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/include/linux/if_ec.h b/include/linux/if_ec.h index e7499aa79783..d85f9f48129f 100644 --- a/include/linux/if_ec.h +++ b/include/linux/if_ec.h | |||
| @@ -5,14 +5,12 @@ | |||
| 5 | 5 | ||
| 6 | /* User visible stuff. Glibc provides its own but libc5 folk will use these */ | 6 | /* User visible stuff. Glibc provides its own but libc5 folk will use these */ |
| 7 | 7 | ||
| 8 | struct ec_addr | 8 | struct ec_addr { |
| 9 | { | ||
| 10 | unsigned char station; /* Station number. */ | 9 | unsigned char station; /* Station number. */ |
| 11 | unsigned char net; /* Network number. */ | 10 | unsigned char net; /* Network number. */ |
| 12 | }; | 11 | }; |
| 13 | 12 | ||
| 14 | struct sockaddr_ec | 13 | struct sockaddr_ec { |
| 15 | { | ||
| 16 | unsigned short sec_family; | 14 | unsigned short sec_family; |
| 17 | unsigned char port; /* Port number. */ | 15 | unsigned char port; /* Port number. */ |
| 18 | unsigned char cb; /* Control/flag byte. */ | 16 | unsigned char cb; /* Control/flag byte. */ |
| @@ -37,8 +35,7 @@ struct sockaddr_ec | |||
| 37 | #define EC_HLEN 6 | 35 | #define EC_HLEN 6 |
| 38 | 36 | ||
| 39 | /* This is what an Econet frame looks like on the wire. */ | 37 | /* This is what an Econet frame looks like on the wire. */ |
| 40 | struct ec_framehdr | 38 | struct ec_framehdr { |
| 41 | { | ||
| 42 | unsigned char dst_stn; | 39 | unsigned char dst_stn; |
| 43 | unsigned char dst_net; | 40 | unsigned char dst_net; |
| 44 | unsigned char src_stn; | 41 | unsigned char src_stn; |
| @@ -62,8 +59,7 @@ static inline struct econet_sock *ec_sk(const struct sock *sk) | |||
| 62 | return (struct econet_sock *)sk; | 59 | return (struct econet_sock *)sk; |
| 63 | } | 60 | } |
| 64 | 61 | ||
| 65 | struct ec_device | 62 | struct ec_device { |
| 66 | { | ||
| 67 | unsigned char station, net; /* Econet protocol address */ | 63 | unsigned char station, net; /* Econet protocol address */ |
| 68 | }; | 64 | }; |
| 69 | 65 | ||
