]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
NET: fix oops at bootime in sysctl code
authorjamal <hadi@cyberus.ca>
Thu, 4 Feb 2010 19:50:56 +0000 (14:50 -0500)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 9 Feb 2010 12:51:02 +0000 (04:51 -0800)
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>
kernel/sysctl_check.c

index b6e7aaea46043a024a5fb2c622974a2199efda94..469193ccf5b79ce0ba969387d71febb48cef5c4f 100644 (file)
@@ -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" },
        {}
 };