diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2008-07-03 16:24:06 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2008-07-03 16:24:06 -0400 |
| commit | e86322f611eef95aafaf726fd3965e5b211f1985 (patch) | |
| tree | 28547e26df4fc6ae671dc8cc6912a53717e4db08 /include/linux/atm_tcp.h | |
| parent | b001a1b6aa960949a24c2cdc28257dfcc9428d74 (diff) | |
| parent | 8948896c9e098c6fd31a6a698a598a7cbd7fa40e (diff) | |
Merge branch 'for-bfields' of git://linux-nfs.org/~tomtucker/xprt-switch-2.6 into for-2.6.27
Diffstat (limited to 'include/linux/atm_tcp.h')
| -rw-r--r-- | include/linux/atm_tcp.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/include/linux/atm_tcp.h b/include/linux/atm_tcp.h index 18787f9b2f19..375638f8554b 100644 --- a/include/linux/atm_tcp.h +++ b/include/linux/atm_tcp.h | |||
| @@ -8,11 +8,9 @@ | |||
| 8 | #define LINUX_ATM_TCP_H | 8 | #define LINUX_ATM_TCP_H |
| 9 | 9 | ||
| 10 | #include <linux/atmapi.h> | 10 | #include <linux/atmapi.h> |
| 11 | 11 | #include <linux/atm.h> | |
| 12 | #ifdef __KERNEL__ | ||
| 13 | #include <linux/types.h> | ||
| 14 | #endif | ||
| 15 | #include <linux/atmioc.h> | 12 | #include <linux/atmioc.h> |
| 13 | #include <linux/types.h> | ||
| 16 | 14 | ||
| 17 | 15 | ||
| 18 | /* | 16 | /* |
| @@ -20,9 +18,9 @@ | |||
| 20 | */ | 18 | */ |
| 21 | 19 | ||
| 22 | struct atmtcp_hdr { | 20 | struct atmtcp_hdr { |
| 23 | uint16_t vpi; | 21 | __u16 vpi; |
| 24 | uint16_t vci; | 22 | __u16 vci; |
| 25 | uint32_t length; /* ... of data part */ | 23 | __u32 length; /* ... of data part */ |
| 26 | }; | 24 | }; |
| 27 | 25 | ||
| 28 | /* | 26 | /* |