sysctl net: Remove unused binary sysctl code
Now that sys_sysctl is a compatiblity wrapper around /proc/sys all sysctl strategy routines, and all ctl_name and strategy entries in the sysctl tables are unused, and can be revmoed. In addition neigh_sysctl_register has been modified to no longer take a strategy argument and it's callers have been modified not to pass one. Cc: "David Miller" <davem@davemloft.net> Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> Cc: netdev@vger.kernel.org Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
此提交包含在:
@@ -113,26 +113,21 @@ static int do_discovery(ctl_table *table, int write,
|
||||
/* One file */
|
||||
static ctl_table irda_table[] = {
|
||||
{
|
||||
.ctl_name = NET_IRDA_DISCOVERY,
|
||||
.procname = "discovery",
|
||||
.data = &sysctl_discovery,
|
||||
.maxlen = sizeof(int),
|
||||
.mode = 0644,
|
||||
.proc_handler = do_discovery,
|
||||
.strategy = sysctl_intvec
|
||||
},
|
||||
{
|
||||
.ctl_name = NET_IRDA_DEVNAME,
|
||||
.procname = "devname",
|
||||
.data = sysctl_devname,
|
||||
.maxlen = 65,
|
||||
.mode = 0644,
|
||||
.proc_handler = do_devname,
|
||||
.strategy = sysctl_string
|
||||
},
|
||||
#ifdef CONFIG_IRDA_DEBUG
|
||||
{
|
||||
.ctl_name = NET_IRDA_DEBUG,
|
||||
.procname = "debug",
|
||||
.data = &irda_debug,
|
||||
.maxlen = sizeof(int),
|
||||
@@ -142,7 +137,6 @@ static ctl_table irda_table[] = {
|
||||
#endif
|
||||
#ifdef CONFIG_IRDA_FAST_RR
|
||||
{
|
||||
.ctl_name = NET_IRDA_FAST_POLL,
|
||||
.procname = "fast_poll_increase",
|
||||
.data = &sysctl_fast_poll_increase,
|
||||
.maxlen = sizeof(int),
|
||||
@@ -151,18 +145,15 @@ static ctl_table irda_table[] = {
|
||||
},
|
||||
#endif
|
||||
{
|
||||
.ctl_name = NET_IRDA_DISCOVERY_SLOTS,
|
||||
.procname = "discovery_slots",
|
||||
.data = &sysctl_discovery_slots,
|
||||
.maxlen = sizeof(int),
|
||||
.mode = 0644,
|
||||
.proc_handler = proc_dointvec_minmax,
|
||||
.strategy = sysctl_intvec,
|
||||
.extra1 = &min_discovery_slots,
|
||||
.extra2 = &max_discovery_slots
|
||||
},
|
||||
{
|
||||
.ctl_name = NET_IRDA_DISCOVERY_TIMEOUT,
|
||||
.procname = "discovery_timeout",
|
||||
.data = &sysctl_discovery_timeout,
|
||||
.maxlen = sizeof(int),
|
||||
@@ -170,99 +161,83 @@ static ctl_table irda_table[] = {
|
||||
.proc_handler = proc_dointvec
|
||||
},
|
||||
{
|
||||
.ctl_name = NET_IRDA_SLOT_TIMEOUT,
|
||||
.procname = "slot_timeout",
|
||||
.data = &sysctl_slot_timeout,
|
||||
.maxlen = sizeof(int),
|
||||
.mode = 0644,
|
||||
.proc_handler = proc_dointvec_minmax,
|
||||
.strategy = sysctl_intvec,
|
||||
.extra1 = &min_slot_timeout,
|
||||
.extra2 = &max_slot_timeout
|
||||
},
|
||||
{
|
||||
.ctl_name = NET_IRDA_MAX_BAUD_RATE,
|
||||
.procname = "max_baud_rate",
|
||||
.data = &sysctl_max_baud_rate,
|
||||
.maxlen = sizeof(int),
|
||||
.mode = 0644,
|
||||
.proc_handler = proc_dointvec_minmax,
|
||||
.strategy = sysctl_intvec,
|
||||
.extra1 = &min_max_baud_rate,
|
||||
.extra2 = &max_max_baud_rate
|
||||
},
|
||||
{
|
||||
.ctl_name = NET_IRDA_MIN_TX_TURN_TIME,
|
||||
.procname = "min_tx_turn_time",
|
||||
.data = &sysctl_min_tx_turn_time,
|
||||
.maxlen = sizeof(int),
|
||||
.mode = 0644,
|
||||
.proc_handler = proc_dointvec_minmax,
|
||||
.strategy = sysctl_intvec,
|
||||
.extra1 = &min_min_tx_turn_time,
|
||||
.extra2 = &max_min_tx_turn_time
|
||||
},
|
||||
{
|
||||
.ctl_name = NET_IRDA_MAX_TX_DATA_SIZE,
|
||||
.procname = "max_tx_data_size",
|
||||
.data = &sysctl_max_tx_data_size,
|
||||
.maxlen = sizeof(int),
|
||||
.mode = 0644,
|
||||
.proc_handler = proc_dointvec_minmax,
|
||||
.strategy = sysctl_intvec,
|
||||
.extra1 = &min_max_tx_data_size,
|
||||
.extra2 = &max_max_tx_data_size
|
||||
},
|
||||
{
|
||||
.ctl_name = NET_IRDA_MAX_TX_WINDOW,
|
||||
.procname = "max_tx_window",
|
||||
.data = &sysctl_max_tx_window,
|
||||
.maxlen = sizeof(int),
|
||||
.mode = 0644,
|
||||
.proc_handler = proc_dointvec_minmax,
|
||||
.strategy = sysctl_intvec,
|
||||
.extra1 = &min_max_tx_window,
|
||||
.extra2 = &max_max_tx_window
|
||||
},
|
||||
{
|
||||
.ctl_name = NET_IRDA_MAX_NOREPLY_TIME,
|
||||
.procname = "max_noreply_time",
|
||||
.data = &sysctl_max_noreply_time,
|
||||
.maxlen = sizeof(int),
|
||||
.mode = 0644,
|
||||
.proc_handler = proc_dointvec_minmax,
|
||||
.strategy = sysctl_intvec,
|
||||
.extra1 = &min_max_noreply_time,
|
||||
.extra2 = &max_max_noreply_time
|
||||
},
|
||||
{
|
||||
.ctl_name = NET_IRDA_WARN_NOREPLY_TIME,
|
||||
.procname = "warn_noreply_time",
|
||||
.data = &sysctl_warn_noreply_time,
|
||||
.maxlen = sizeof(int),
|
||||
.mode = 0644,
|
||||
.proc_handler = proc_dointvec_minmax,
|
||||
.strategy = sysctl_intvec,
|
||||
.extra1 = &min_warn_noreply_time,
|
||||
.extra2 = &max_warn_noreply_time
|
||||
},
|
||||
{
|
||||
.ctl_name = NET_IRDA_LAP_KEEPALIVE_TIME,
|
||||
.procname = "lap_keepalive_time",
|
||||
.data = &sysctl_lap_keepalive_time,
|
||||
.maxlen = sizeof(int),
|
||||
.mode = 0644,
|
||||
.proc_handler = proc_dointvec_minmax,
|
||||
.strategy = sysctl_intvec,
|
||||
.extra1 = &min_lap_keepalive_time,
|
||||
.extra2 = &max_lap_keepalive_time
|
||||
},
|
||||
{ .ctl_name = 0 }
|
||||
{ }
|
||||
};
|
||||
|
||||
static struct ctl_path irda_path[] = {
|
||||
{ .procname = "net", .ctl_name = CTL_NET, },
|
||||
{ .procname = "irda", .ctl_name = NET_IRDA, },
|
||||
{ .procname = "net", },
|
||||
{ .procname = "irda", },
|
||||
{ }
|
||||
};
|
||||
|
||||
|
新增問題並參考
封鎖使用者