From: jamal <hadi@cyberus.ca>
Date: Thu, 4 Feb 2010 19:50:56 +0000 (-0500)
Subject: NET: fix oops at bootime in sysctl code
X-Git-Tag: v2.6.32.8~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6117db7678e1175d482ce4a2a31203d39f050319;p=thirdparty%2Fkernel%2Fstable.git

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>
---

diff --git a/kernel/sysctl_check.c b/kernel/sysctl_check.c
index b6e7aaea46043..469193ccf5b79 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" },
 	{}
 };