ipv4: Don't add deprecated new binary sysctl value.

Reported-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 20825e5f433f770dcd9323af94a674f255bef04c..c34b4c82b0dcd6f60937cf6507da1b9988fd9d6f 100644 (file)
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -425,7 +425,6 @@ enum
        NET_TCP_ALLOWED_CONG_CONTROL=123,
        NET_TCP_MAX_SSTHRESH=124,
        NET_TCP_FRTO_RESPONSE=125,
-       NET_IPV4_EARLY_DEMUX=126,
 };
 
 enum {

diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
index 6a3cf8253aaec58aab3ee065350fce068aa9977f..a650694883a180e93c5ec1d6414e45ba904fcff3 100644 (file)
--- a/kernel/sysctl_binary.c
+++ b/kernel/sysctl_binary.c
@@ -415,8 +415,6 @@ static const struct bin_table bin_net_ipv4_table[] = {
        { CTL_INT,      NET_IPV4_IPFRAG_SECRET_INTERVAL,        "ipfrag_secret_interval" },
        /* NET_IPV4_IPFRAG_MAX_DIST "ipfrag_max_dist" no longer used */
 
-       { CTL_INT,      NET_IPV4_EARLY_DEMUX,                   "ip_early_demux" },
-
        { CTL_INT,      2088 /* NET_IPQ_QMAX */,                "ip_queue_maxlen" },
 
        /* NET_TCP_DEFAULT_WIN_SCALE unused */