diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-06 10:37:02 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-06 10:37:02 -0400 |
| commit | ab11b487402f97975f3ac1eeea09c82f4431481e (patch) | |
| tree | 86337c5cbbd2b0c4bd07c0847a1dc7de3d898147 /include/net/ip6_fib.h | |
| parent | 1c689cbcf2c2b7a35cd237abddd9206bb1b6fee1 (diff) | |
| parent | fc1caf6eafb30ea185720e29f7f5eccca61ecd60 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'include/net/ip6_fib.h')
| -rw-r--r-- | include/net/ip6_fib.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h index 4b1dc1161c37..062a823d311c 100644 --- a/include/net/ip6_fib.h +++ b/include/net/ip6_fib.h | |||
| @@ -84,13 +84,11 @@ struct rt6key { | |||
| 84 | struct fib6_table; | 84 | struct fib6_table; |
| 85 | 85 | ||
| 86 | struct rt6_info { | 86 | struct rt6_info { |
| 87 | union { | 87 | struct dst_entry dst; |
| 88 | struct dst_entry dst; | ||
| 89 | } u; | ||
| 90 | 88 | ||
| 91 | #define rt6i_dev u.dst.dev | 89 | #define rt6i_dev dst.dev |
| 92 | #define rt6i_nexthop u.dst.neighbour | 90 | #define rt6i_nexthop dst.neighbour |
| 93 | #define rt6i_expires u.dst.expires | 91 | #define rt6i_expires dst.expires |
| 94 | 92 | ||
| 95 | /* | 93 | /* |
| 96 | * Tail elements of dst_entry (__refcnt etc.) | 94 | * Tail elements of dst_entry (__refcnt etc.) |