summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-06-23 06:02:22 (GMT)
committerDavid S. Miller <davem@davemloft.net>2012-06-23 06:02:22 (GMT)
commitdfbce08c19cba2ba4faaf8c0dd6d7678f46c78dd (patch)
tree35b4151132478f6e7f935ce7a3a82fc636d6a4c7
parent7586eceb0abc0ea1c2b023e3e5d4dfd4ff40930a (diff)
downloadlinux-fsl-qoriq-dfbce08c19cba2ba4faaf8c0dd6d7678f46c78dd.tar.xz
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>
-rw-r--r--include/linux/sysctl.h1
-rw-r--r--kernel/sysctl_binary.c2
2 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 20825e5..c34b4c8 100644
--- 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 6a3cf82..a650694 100644
--- 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 */