From e2d89f32f2f9c8b41ef00972cf2e2ea9fe110772 Mon Sep 17 00:00:00 2001 From: Richard Kennedy Date: Sat, 21 Mar 2009 13:29:05 -0700 Subject: [PATCH] --- yaml --- r: 135346 b: refs/heads/master c: 04ec5cfcfd9a69c16fc8adb9d7f4836eedb84e53 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/net/if_inet6.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0bf6e2e093da..cdee0b60e75f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 29ded5f76ce3c41f43b64643b074b7c9c9ebd925 +refs/heads/master: 04ec5cfcfd9a69c16fc8adb9d7f4836eedb84e53 diff --git a/trunk/include/net/if_inet6.h b/trunk/include/net/if_inet6.h index c8effa4b1feb..38b78132019b 100644 --- a/trunk/include/net/if_inet6.h +++ b/trunk/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;