diff options
| author | David S. Miller <davem@davemloft.net> | 2020-05-24 13:47:27 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-24 13:47:27 -0700 |
| commit | 13209a8f7304a34158f4366e8ea07a1965c05ac7 (patch) | |
| tree | f25ba4846fe02a32d4a14ef1a6be3227363da919 /net/rxrpc/sysctl.c | |
| parent | 316107119f473e764cf5e50437333c8b83bec0da (diff) | |
| parent | 98790bbac4db1697212ce9462ec35ca09c4a2810 (diff) | |
| download | linux-13209a8f7304a34158f4366e8ea07a1965c05ac7.tar.gz linux-13209a8f7304a34158f4366e8ea07a1965c05ac7.tar.bz2 linux-13209a8f7304a34158f4366e8ea07a1965c05ac7.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
The MSCC bug fix in 'net' had to be slightly adjusted because the
register accesses are done slightly differently in net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rxrpc/sysctl.c')
| -rw-r--r-- | net/rxrpc/sysctl.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/net/rxrpc/sysctl.c b/net/rxrpc/sysctl.c index 174e903e18de..e91acc95ff28 100644 --- a/net/rxrpc/sysctl.c +++ b/net/rxrpc/sysctl.c @@ -71,15 +71,6 @@ static struct ctl_table rxrpc_sysctl_table[] = { .extra1 = (void *)&one_jiffy, .extra2 = (void *)&max_jiffies, }, - { - .procname = "resend_timeout", - .data = &rxrpc_resend_timeout, - .maxlen = sizeof(unsigned long), - .mode = 0644, - .proc_handler = proc_doulongvec_ms_jiffies_minmax, - .extra1 = (void *)&one_jiffy, - .extra2 = (void *)&max_jiffies, - }, /* Non-time values */ { |