diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-10 05:22:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-10 05:22:26 -0400 |
| commit | 65b53e4cc90e59936733b3b95b9451d2ca47528d (patch) | |
| tree | 29932718192962671c48c3fd1ea017a6112459e8 /include/linux/rtnetlink.h | |
| parent | 788c0a53164c05c5ccdb1472474372b72ba74644 (diff) | |
| parent | 2e761e0532a784816e7e822dbaaece8c5d4be14d (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/tg3.c
drivers/net/wireless/rt2x00/rt2x00dev.c
net/mac80211/ieee80211_i.h
Diffstat (limited to 'include/linux/rtnetlink.h')
| -rw-r--r-- | include/linux/rtnetlink.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index 44c81c744538..a2aec2c0cfb5 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h | |||
| @@ -267,10 +267,10 @@ enum rtattr_type_t | |||
| 267 | RTA_PREFSRC, | 267 | RTA_PREFSRC, |
| 268 | RTA_METRICS, | 268 | RTA_METRICS, |
| 269 | RTA_MULTIPATH, | 269 | RTA_MULTIPATH, |
| 270 | RTA_PROTOINFO, | 270 | RTA_PROTOINFO, /* no longer used */ |
| 271 | RTA_FLOW, | 271 | RTA_FLOW, |
| 272 | RTA_CACHEINFO, | 272 | RTA_CACHEINFO, |
| 273 | RTA_SESSION, | 273 | RTA_SESSION, /* no longer used */ |
| 274 | RTA_MP_ALGO, /* no longer used */ | 274 | RTA_MP_ALGO, /* no longer used */ |
| 275 | RTA_TABLE, | 275 | RTA_TABLE, |
| 276 | __RTA_MAX | 276 | __RTA_MAX |