diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 08:59:45 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 08:59:45 -0400 |
| commit | d59bf96cdde5b874a57bfd1425faa45da915d0b7 (patch) | |
| tree | 351a40b72514d620e5bebea2de38c26f23277ffc /include/linux/pfkeyv2.h | |
| parent | 28df955a2ad484d602314b30183ea8496a9aa34a (diff) | |
| parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'include/linux/pfkeyv2.h')
| -rw-r--r-- | include/linux/pfkeyv2.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pfkeyv2.h b/include/linux/pfkeyv2.h index bac0fb389cf1..d5dd471da225 100644 --- a/include/linux/pfkeyv2.h +++ b/include/linux/pfkeyv2.h | |||
| @@ -159,7 +159,7 @@ struct sadb_spirange { | |||
| 159 | struct sadb_x_kmprivate { | 159 | struct sadb_x_kmprivate { |
| 160 | uint16_t sadb_x_kmprivate_len; | 160 | uint16_t sadb_x_kmprivate_len; |
| 161 | uint16_t sadb_x_kmprivate_exttype; | 161 | uint16_t sadb_x_kmprivate_exttype; |
| 162 | u_int32_t sadb_x_kmprivate_reserved; | 162 | uint32_t sadb_x_kmprivate_reserved; |
| 163 | } __attribute__((packed)); | 163 | } __attribute__((packed)); |
| 164 | /* sizeof(struct sadb_x_kmprivate) == 8 */ | 164 | /* sizeof(struct sadb_x_kmprivate) == 8 */ |
| 165 | 165 | ||