---

yaml --- r: 4402 b: refs/heads/master c: 4c866aa h: refs/heads/master v: v3
git-mirror · Jul 9, 2005 · 8daf07c · 8daf07c
1 parent 3dfa7ef
commit 8daf07c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;
 		}