diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-05 01:05:48 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-05 22:34:52 -0700 |
| commit | 595fc71baa1e80420fe89a400ff2d9cc099d22fc (patch) | |
| tree | 9b48753d313b6985152f63616c7a0026d18f5ad0 | |
| parent | dc99f600698dcac69b8f56dda9a8a00d645c5ffc (diff) | |
| download | op-kernel-dev-595fc71baa1e80420fe89a400ff2d9cc099d22fc.zip op-kernel-dev-595fc71baa1e80420fe89a400ff2d9cc099d22fc.tar.gz | |
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>
| -rw-r--r-- | include/net/ip.h | 3 | ||||
| -rw-r--r-- | net/ipv4/ip_fragment.c | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/net/ip.h b/include/net/ip.h index 9fa9416d1..aa76c7a 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -404,7 +404,8 @@ enum ip_defrag_users { __IP_DEFRAG_CONNTRACK_BRIDGE_IN = IP_DEFRAG_CONNTRACK_BRIDGE_IN + USHRT_MAX, IP_DEFRAG_VS_IN, IP_DEFRAG_VS_OUT, - IP_DEFRAG_VS_FWD + IP_DEFRAG_VS_FWD, + IP_DEFRAG_AF_PACKET, }; int ip_defrag(struct sk_buff *skb, u32 user); diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c index 0ad6035..0e0ab98 100644 --- a/net/ipv4/ip_fragment.c +++ b/net/ipv4/ip_fragment.c @@ -261,8 +261,9 @@ static void ip_expire(unsigned long arg) * Only an end host needs to send an ICMP * "Fragment Reassembly Timeout" message, per RFC792. */ - if (qp->user == IP_DEFRAG_CONNTRACK_IN && - skb_rtable(head)->rt_type != RTN_LOCAL) + if (qp->user == IP_DEFRAG_AF_PACKET || + (qp->user == IP_DEFRAG_CONNTRACK_IN && + skb_rtable(head)->rt_type != RTN_LOCAL)) goto out_rcu_unlock; |
