diff --git a/[refs] b/[refs] index 5984de3b5f79..f14eb46ad880 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 229bf0cbaa054f1502ab4ee219f05985d2c838d1 +refs/heads/master: 8e3461d01bdbc3dbf993448ed9ad4acaaeb6495d diff --git a/trunk/net/ipv4/proc.c b/trunk/net/ipv4/proc.c index 367b81f6f57a..120e1f7461da 100644 --- a/trunk/net/ipv4/proc.c +++ b/trunk/net/ipv4/proc.c @@ -342,7 +342,7 @@ static int snmp_seq_show(struct seq_file *seq, void *v) seq_printf(seq, " %s", snmp4_ipstats_list[i].name); seq_printf(seq, "\nIp: %d %d", - IPV4_DEVCONF_ALL(&init_net, FORWARDING) ? 1 : 2, + IPV4_DEVCONF_ALL(net, FORWARDING) ? 1 : 2, sysctl_ip_default_ttl); for (i = 0; snmp4_ipstats_list[i].name != NULL; i++)