diff options
| author | Varun Wadekar <vwadekar@nvidia.com> | 2011-12-14 15:33:34 +0530 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2011-12-14 15:33:34 +0530 |
| commit | 638bc555a05c39ced59744c79c0461536782808d (patch) | |
| tree | 42bf9c8cdfd44898be31bc31cf2e4743a2484cf4 /include/net/inetpeer.h | |
| parent | f05a661e2247076a0c0e5a09ee8c4397b0de855e (diff) | |
| parent | caf4b0430be8296bf644199bf3ed3056c02420c7 (diff) | |
Merge branch 'linux-3.1.5' into android-tegra-nv-3.1
Conflicts:
arch/arm/Kconfig
Change-Id: If8aaaf3efcbbf6c9017b38efb6d76ef933f147fa
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'include/net/inetpeer.h')
| -rw-r--r-- | include/net/inetpeer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h index 78c83e62218f..e9ff3fc5e688 100644 --- a/include/net/inetpeer.h +++ b/include/net/inetpeer.h @@ -35,6 +35,7 @@ struct inet_peer { u32 metrics[RTAX_MAX]; u32 rate_tokens; /* rate limiting for ICMP */ + int redirect_genid; unsigned long rate_last; unsigned long pmtu_expires; u32 pmtu_orig; |