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/dn_route.h | |
| parent | 1c689cbcf2c2b7a35cd237abddd9206bb1b6fee1 (diff) | |
| parent | fc1caf6eafb30ea185720e29f7f5eccca61ecd60 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'include/net/dn_route.h')
| -rw-r--r-- | include/net/dn_route.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/net/dn_route.h b/include/net/dn_route.h index 60c9f22d8694..ccadab3aa3f6 100644 --- a/include/net/dn_route.h +++ b/include/net/dn_route.h | |||
| @@ -65,9 +65,7 @@ extern void dn_rt_cache_flush(int delay); | |||
| 65 | * packets to the originating host. | 65 | * packets to the originating host. |
| 66 | */ | 66 | */ |
| 67 | struct dn_route { | 67 | struct dn_route { |
| 68 | union { | 68 | struct dst_entry dst; |
| 69 | struct dst_entry dst; | ||
| 70 | } u; | ||
| 71 | 69 | ||
| 72 | struct flowi fl; | 70 | struct flowi fl; |
| 73 | 71 | ||