summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjamal <hadi@cyberus.ca>2010-02-04 14:50:56 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-02-09 04:51:02 -0800
commit6117db7678e1175d482ce4a2a31203d39f050319 (patch)
treea4575a06587e8c5a0af2bc758d410e6b93b821d3
parente4a6a351099037e7d20ec8b21907f38f3e35d483 (diff)
downloadlinux-stable-6117db7678e1175d482ce4a2a31203d39f050319.tar.gz
linux-stable-6117db7678e1175d482ce4a2a31203d39f050319.tar.bz2
linux-stable-6117db7678e1175d482ce4a2a31203d39f050319.zip
NET: fix oops at bootime in sysctl code
This fixes the boot time oops on the 2.6.32-stable tree. It is needed only in this tree due to the divergance from upstream. From: jamal <hadi@cyberus.ca> Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--kernel/sysctl_check.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/sysctl_check.c b/kernel/sysctl_check.c
index b6e7aaea4604..469193ccf5b7 100644
--- a/kernel/sysctl_check.c
+++ b/kernel/sysctl_check.c
@@ -220,6 +220,7 @@ static const struct trans_ctl_table trans_net_ipv4_conf_vars_table[] = {
{ NET_IPV4_CONF_PROMOTE_SECONDARIES, "promote_secondaries" },
{ NET_IPV4_CONF_ARP_ACCEPT, "arp_accept" },
{ NET_IPV4_CONF_ARP_NOTIFY, "arp_notify" },
+ { NET_IPV4_CONF_SRC_VMARK, "src_valid_mark" },
{}
};