projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[firefly-linux-kernel-4.4.55.git]
/
net
/
ipv4
/
icmp.c
diff --git
a/net/ipv4/icmp.c
b/net/ipv4/icmp.c
index 4d1c40972a4bcb7b2d32e08b0c21fa79eb69c02c..2a0455911ee0a9c9119472c01d4d4717f58e190b 100644
(file)
--- a/
net/ipv4/icmp.c
+++ b/
net/ipv4/icmp.c
@@
-192,7
+192,7
@@
int sysctl_icmp_echo_ignore_all;
int sysctl_icmp_echo_ignore_broadcasts = 1;
/* Control parameter - ignore bogus broadcast responses? */
int sysctl_icmp_echo_ignore_broadcasts = 1;
/* Control parameter - ignore bogus broadcast responses? */
-int sysctl_icmp_ignore_bogus_error_responses;
+int sysctl_icmp_ignore_bogus_error_responses
= 1
;
/*
* Configurable global rate limit.
/*
* Configurable global rate limit.
@@
-753,7
+753,7
@@
static void icmp_redirect(struct sk_buff *skb)
case ICMP_REDIR_HOST:
case ICMP_REDIR_HOSTTOS:
ip_rt_redirect(skb->nh.iph->saddr, ip, skb->h.icmph->un.gateway,
case ICMP_REDIR_HOST:
case ICMP_REDIR_HOSTTOS:
ip_rt_redirect(skb->nh.iph->saddr, ip, skb->h.icmph->un.gateway,
- iph->saddr,
iph->tos,
skb->dev);
+ iph->saddr, skb->dev);
break;
}
out:
break;
}
out:
@@
-1107,7
+1107,7
@@
void __init icmp_init(struct net_proto_family *ops)
struct inet_sock *inet;
int i;
struct inet_sock *inet;
int i;
- for_each_cpu(i) {
+ for_each_
possible_
cpu(i) {
int err;
err = sock_create_kern(PF_INET, SOCK_RAW, IPPROTO_ICMP,
int err;
err = sock_create_kern(PF_INET, SOCK_RAW, IPPROTO_ICMP,