diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-04-18 23:57:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-04-18 23:57:11 -0700 |
| commit | dfb9c436d78ca78c7c3fdc879e4c4691e19e95d1 (patch) | |
| tree | 8e0ed679ef6f47a14e83d1b69cd137d9935e5bdf /include/linux | |
| parent | 299b664abcaf14bcc83d06a31cb2d0061ab1d69a (diff) | |
| parent | 987793dcac3ab8dfa05924a5baf42d4fcbf87668 (diff) | |
Merge master.kernel.org:/home/davem/BK/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux')
| -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 81807d58bb3e..a48a3ecc7c21 100644 --- a/include/linux/pfkeyv2.h +++ b/include/linux/pfkeyv2.h @@ -181,7 +181,7 @@ struct sadb_x_policy { uint8_t sadb_x_policy_dir; uint8_t sadb_x_policy_reserved; uint32_t sadb_x_policy_id; - uint32_t sadb_x_policy_reserved2; + uint32_t sadb_x_policy_priority; } __attribute__((packed)); /* sizeof(struct sadb_x_policy) == 16 */ |