diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-08-23 15:29:34 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-08-23 15:29:59 -0700 |
| commit | 56e02a75e581551ee5e1978a159bf1fc080449ab (patch) | |
| tree | 07ccafccb493accf65c58d1756617d27f64752d1 /include | |
| parent | 3f415d5be55195a41c47ca3bf92e6b2c079fc8d5 (diff) | |
| parent | 72de01ecbd5ca264cf86477edf756cf64893b6c0 (diff) | |
Merge branch 'android-tegra-2.6.39' into android-tegra-nv-2.6.39
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/addrconf.h | 2 | ||||
| -rw-r--r-- | include/net/if_inet6.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/net/addrconf.h b/include/net/addrconf.h index 23710aa6a181..c5086fa4d6ae 100644 --- a/include/net/addrconf.h +++ b/include/net/addrconf.h @@ -8,7 +8,7 @@ #define TEMP_VALID_LIFETIME (7*86400) #define TEMP_PREFERRED_LIFETIME (86400) -#define REGEN_MAX_RETRY (5) +#define REGEN_MAX_RETRY (3) #define MAX_DESYNC_FACTOR (600) #define ADDR_CHECK_FREQUENCY (120*HZ) diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h index fccc2180c61b..e2f6654905b6 100644 --- a/include/net/if_inet6.h +++ b/include/net/if_inet6.h @@ -43,6 +43,7 @@ struct inet6_ifaddr { struct in6_addr addr; __u32 prefix_len; + /* In seconds, relative to tstamp. Expiry is at tstamp + HZ * lft. */ __u32 valid_lft; __u32 prefered_lft; atomic_t refcnt; |