diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-09 15:36:47 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-10 13:29:30 -0800 |
| commit | ddd4aa424b866a08ceba7ddf38e61542c91b93a0 (patch) | |
| tree | 654235ceccd1c3f9dfbb7422ebe09b21544325d6 | |
| parent | 7a71ed899e77cc822abb863e24a422dcf7e9fa33 (diff) | |
| download | linux-ddd4aa424b866a08ceba7ddf38e61542c91b93a0.tar.bz2 | |
inetpeer: Add redirect and PMTU discovery cached info.
Validity of the cached PMTU information is indicated by it's
expiration value being non-zero, just as per dst->expires.
The scheme we will use is that we will remember the pre-ICMP value
held in the metrics or route entry, and then at expiration time
we will restore that value.
In this way PMTU expiration does not kill off the cached route as is
done currently.
Redirect information is permanent, or at least until another redirect
is received.
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/inetpeer.h | 18 | ||||
| -rw-r--r-- | net/ipv4/inetpeer.c | 2 |
2 files changed, 13 insertions, 7 deletions
diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h index 60e2cd8d1319..e6dd8da6b2ad 100644 --- a/include/net/inetpeer.h +++ b/include/net/inetpeer.h @@ -43,13 +43,17 @@ struct inet_peer { */ union { struct { - atomic_t rid; /* Frag reception counter */ - atomic_t ip_id_count; /* IP ID for the next packet */ - __u32 tcp_ts; - __u32 tcp_ts_stamp; - u32 metrics[RTAX_MAX]; - u32 rate_tokens; /* rate limiting for ICMP */ - unsigned long rate_last; + atomic_t rid; /* Frag reception counter */ + atomic_t ip_id_count; /* IP ID for the next packet */ + __u32 tcp_ts; + __u32 tcp_ts_stamp; + u32 metrics[RTAX_MAX]; + u32 rate_tokens; /* rate limiting for ICMP */ + unsigned long rate_last; + unsigned long pmtu_expires; + u32 pmtu_orig; + u32 pmtu_learned; + struct inetpeer_addr_base redirect_learned; }; struct rcu_head rcu; }; diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c index 4346c38763ae..48f8d4592ccd 100644 --- a/net/ipv4/inetpeer.c +++ b/net/ipv4/inetpeer.c @@ -515,6 +515,8 @@ struct inet_peer *inet_getpeer(struct inetpeer_addr *daddr, int create) p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW; p->rate_tokens = 0; p->rate_last = 0; + p->pmtu_expires = 0; + memset(&p->redirect_learned, 0, sizeof(p->redirect_learned)); INIT_LIST_HEAD(&p->unused); |