diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-13 23:52:39 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-13 23:52:39 -0400 |
| commit | 4ae127d1b6c71f9240dd4245f240e6dd8fc98014 (patch) | |
| tree | b7aa27b3e0c655f4613fe2146cb57d7f69e421f6 /include/linux/rtnetlink.h | |
| parent | 875ec4333b99144e2589e900a0bcd2c25c757b27 (diff) | |
| parent | 7775c9753b94fe429dc4323360d6502c95e0dd6e (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smc911x.c
Diffstat (limited to 'include/linux/rtnetlink.h')
| -rw-r--r-- | include/linux/rtnetlink.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index a2aec2c0cfb5..b358c704d102 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h | |||
| @@ -246,6 +246,7 @@ enum rt_class_t | |||
| 246 | { | 246 | { |
| 247 | RT_TABLE_UNSPEC=0, | 247 | RT_TABLE_UNSPEC=0, |
| 248 | /* User defined values */ | 248 | /* User defined values */ |
| 249 | RT_TABLE_COMPAT=252, | ||
| 249 | RT_TABLE_DEFAULT=253, | 250 | RT_TABLE_DEFAULT=253, |
| 250 | RT_TABLE_MAIN=254, | 251 | RT_TABLE_MAIN=254, |
| 251 | RT_TABLE_LOCAL=255, | 252 | RT_TABLE_LOCAL=255, |