From 4455772aa4e3c278840516d94babc577cf52c383 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Fri, 22 Jun 2012 23:02:22 -0700 Subject: [PATCH] --- yaml --- r: 314569 b: refs/heads/master c: dfbce08c19cba2ba4faaf8c0dd6d7678f46c78dd h: refs/heads/master i: 314567: 6b30ce4864d4f96ec521acdd7d59ef1242cac678 v: v3 --- [refs] | 2 +- trunk/include/linux/sysctl.h | 1 - trunk/kernel/sysctl_binary.c | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1fc5422b3de8..3a4f0dba2bc4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7586eceb0abc0ea1c2b023e3e5d4dfd4ff40930a +refs/heads/master: dfbce08c19cba2ba4faaf8c0dd6d7678f46c78dd diff --git a/trunk/include/linux/sysctl.h b/trunk/include/linux/sysctl.h index 20825e5f433f..c34b4c82b0dc 100644 --- a/trunk/include/linux/sysctl.h +++ b/trunk/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/trunk/kernel/sysctl_binary.c b/trunk/kernel/sysctl_binary.c index 6a3cf8253aae..a650694883a1 100644 --- a/trunk/kernel/sysctl_binary.c +++ b/trunk/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 */