diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-05 04:05:48 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-06 01:34:52 -0400 |
| commit | 595fc71baa1e80420fe89a400ff2d9cc099d22fc (patch) | |
| tree | 9b48753d313b6985152f63616c7a0026d18f5ad0 /net/ipv4 | |
| parent | dc99f600698dcac69b8f56dda9a8a00d645c5ffc (diff) | |
ipv4: Add ip_defrag() agent IP_DEFRAG_AF_PACKET.
Elide the ICMP on frag queue timeouts unconditionally for
this user.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/ip_fragment.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c index 0ad6035f6366..0e0ab98abc6f 100644 --- a/net/ipv4/ip_fragment.c +++ b/net/ipv4/ip_fragment.c | |||
| @@ -261,8 +261,9 @@ static void ip_expire(unsigned long arg) | |||
| 261 | * Only an end host needs to send an ICMP | 261 | * Only an end host needs to send an ICMP |
| 262 | * "Fragment Reassembly Timeout" message, per RFC792. | 262 | * "Fragment Reassembly Timeout" message, per RFC792. |
| 263 | */ | 263 | */ |
| 264 | if (qp->user == IP_DEFRAG_CONNTRACK_IN && | 264 | if (qp->user == IP_DEFRAG_AF_PACKET || |
| 265 | skb_rtable(head)->rt_type != RTN_LOCAL) | 265 | (qp->user == IP_DEFRAG_CONNTRACK_IN && |
| 266 | skb_rtable(head)->rt_type != RTN_LOCAL)) | ||
| 266 | goto out_rcu_unlock; | 267 | goto out_rcu_unlock; |
| 267 | 268 | ||
| 268 | 269 | ||