diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-28 22:24:12 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-28 22:24:12 (GMT) |
| commit | d00ab2fdd4dc4361c97777bc1fef7234329d4659 (patch) | |
| tree | b8d8f98c1af633bbc1570b4270b39727737beebf /include/net/if_inet6.h | |
| parent | 88f502fedba82eff252b6420e8b8328e4ae25c67 (diff) | |
| parent | 7c730ccdc1188b97f5c8cb690906242c7ed75c22 (diff) | |
| download | linux-d00ab2fdd4dc4361c97777bc1fef7234329d4659.tar.xz | |
Merge branch 'linus' into core/futexes
Diffstat (limited to 'include/net/if_inet6.h')
| -rw-r--r-- | include/net/if_inet6.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h index c8effa4..38b7813 100644 --- a/include/net/if_inet6.h +++ b/include/net/if_inet6.h @@ -39,8 +39,6 @@ struct inet6_ifaddr __u32 valid_lft; __u32 prefered_lft; - unsigned long cstamp; /* created timestamp */ - unsigned long tstamp; /* updated timestamp */ atomic_t refcnt; spinlock_t lock; @@ -49,6 +47,9 @@ struct inet6_ifaddr __u16 scope; + unsigned long cstamp; /* created timestamp */ + unsigned long tstamp; /* updated timestamp */ + struct timer_list timer; struct inet6_dev *idev; |