diff --git a/[refs] b/[refs] index 9d85ad945f91..eaf4c516bdaa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 86a76caf8705e3524e15f343f3c4806939a06dc8 +refs/heads/master: 4c866aa798bc6de0a1d45495229e9f13c35b55c2 diff --git a/trunk/net/ipv4/icmp.c b/trunk/net/ipv4/icmp.c index cb759484979d..279f57abfecb 100644 --- a/trunk/net/ipv4/icmp.c +++ b/trunk/net/ipv4/icmp.c @@ -970,7 +970,8 @@ int icmp_rcv(struct sk_buff *skb) * RFC 1122: 3.2.2.8 An ICMP_TIMESTAMP MAY be silently * discarded if to broadcast/multicast. */ - if (icmph->type == ICMP_ECHO && + if ((icmph->type == ICMP_ECHO || + icmph->type == ICMP_TIMESTAMP) && sysctl_icmp_echo_ignore_broadcasts) { goto error; }