diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 01:33:11 -0500 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 01:33:11 -0500 |
| commit | 1bb95834bbcdc969e477a9284cf96c17a4c2616f (patch) | |
| tree | 9cf66b22a611bb6bc78778c05dac72263bb45a23 /include/net/dst.h | |
| parent | 85345517fe6d4de27b0d6ca19fef9d28ac947c4a (diff) | |
| parent | a41c73e04673b47730df682446f0d52f95e32a5b (diff) | |
Merge remote branch 'airlied/drm-fixes' into drm-intel-fixes
Diffstat (limited to 'include/net/dst.h')
| -rw-r--r-- | include/net/dst.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/dst.h b/include/net/dst.h index a217c838ec0d..ffe9cb719c0e 100644 --- a/include/net/dst.h +++ b/include/net/dst.h | |||
| @@ -95,7 +95,7 @@ struct dst_entry { | |||
| 95 | unsigned long lastuse; | 95 | unsigned long lastuse; |
| 96 | union { | 96 | union { |
| 97 | struct dst_entry *next; | 97 | struct dst_entry *next; |
| 98 | struct rtable *rt_next; | 98 | struct rtable __rcu *rt_next; |
| 99 | struct rt6_info *rt6_next; | 99 | struct rt6_info *rt6_next; |
| 100 | struct dn_route *dn_next; | 100 | struct dn_route *dn_next; |
| 101 | }; | 101 | }; |