diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-09-13 11:24:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-09-13 11:24:25 -0400 |
| commit | b2315372eac9cd9f622c32a93e323cf6f0f03462 (patch) | |
| tree | 9e1faa7cdcddf5d90bec4fb9523742d4cce699a1 /include/linux/rtnetlink.h | |
| parent | 5326152fa182b0a16e4abf913ce403e3c7ab53b7 (diff) | |
| parent | c87ce65868bbf9bbea9c3f112ff8315302daf8f2 (diff) | |
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'include/linux/rtnetlink.h')
| -rw-r--r-- | include/linux/rtnetlink.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index c91476ce314a..dff3192374f8 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h | |||
| @@ -351,6 +351,8 @@ enum | |||
| 351 | #define RTAX_INITCWND RTAX_INITCWND | 351 | #define RTAX_INITCWND RTAX_INITCWND |
| 352 | RTAX_FEATURES, | 352 | RTAX_FEATURES, |
| 353 | #define RTAX_FEATURES RTAX_FEATURES | 353 | #define RTAX_FEATURES RTAX_FEATURES |
| 354 | RTAX_RTO_MIN, | ||
| 355 | #define RTAX_RTO_MIN RTAX_RTO_MIN | ||
| 354 | __RTAX_MAX | 356 | __RTAX_MAX |
| 355 | }; | 357 | }; |
| 356 | 358 | ||