diff --git a/[refs] b/[refs] index fcd056ee7113..f6b556abd5af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 280a34c87fe07cb15df19bd798b23740223350fb +refs/heads/master: 263173af5b4635c07dd862255e5b767cd429c640 diff --git a/trunk/net/ipv4/icmp.c b/trunk/net/ipv4/icmp.c index f064031f2031..fee171ec6588 100644 --- a/trunk/net/ipv4/icmp.c +++ b/trunk/net/ipv4/icmp.c @@ -1144,7 +1144,7 @@ static void __net_exit icmp_sk_exit(struct net *net) net->ipv4.icmp_sk = NULL; } -int __net_init icmp_sk_init(struct net *net) +static int __net_init icmp_sk_init(struct net *net) { int i, err;