aboutsummaryrefslogtreecommitdiffstats
path: root/net/sunrpc/xprtsock.c
diff options
context:
space:
mode:
authorChuck Lever <cel@netapp.com>2005-08-25 19:25:54 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2005-09-23 12:38:48 -0400
commit555ee3af161b037865793bd4bebc06b58daafde6 (patch)
tree4c72474dabffab62234db158e5b6c86ace4f9d09 /net/sunrpc/xprtsock.c
parented63c003701a314c4893c11eceb9d68f8f46c662 (diff)
[PATCH] RPC: clean up after nocong was removed
Clean-up: Move some macros that are specific to the Van Jacobson implementation into xprt.c. Get rid of the cong_wait field in rpc_xprt, which is no longer used. Get rid of xprt_clear_backlog. Test-plan: Compile with CONFIG_NFS enabled. Signed-off-by: Chuck Lever <cel@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net/sunrpc/xprtsock.c')
-rw-r--r--net/sunrpc/xprtsock.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 7e5e020fe78d..26402c063f00 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -1100,7 +1100,6 @@ int xs_setup_udp(struct rpc_xprt *xprt, struct rpc_timeout *to)
1100 xprt->prot = IPPROTO_UDP; 1100 xprt->prot = IPPROTO_UDP;
1101 xprt->port = XS_MAX_RESVPORT; 1101 xprt->port = XS_MAX_RESVPORT;
1102 xprt->tsh_size = 0; 1102 xprt->tsh_size = 0;
1103 xprt->cwnd = RPC_INITCWND;
1104 xprt->resvport = capable(CAP_NET_BIND_SERVICE) ? 1 : 0; 1103 xprt->resvport = capable(CAP_NET_BIND_SERVICE) ? 1 : 0;
1105 /* XXX: header size can vary due to auth type, IPv6, etc. */ 1104 /* XXX: header size can vary due to auth type, IPv6, etc. */
1106 xprt->max_payload = (1U << 16) - (MAX_HEADER << 3); 1105 xprt->max_payload = (1U << 16) - (MAX_HEADER << 3);
@@ -1139,7 +1138,6 @@ int xs_setup_tcp(struct rpc_xprt *xprt, struct rpc_timeout *to)
1139 xprt->prot = IPPROTO_TCP; 1138 xprt->prot = IPPROTO_TCP;
1140 xprt->port = XS_MAX_RESVPORT; 1139 xprt->port = XS_MAX_RESVPORT;
1141 xprt->tsh_size = sizeof(rpc_fraghdr) / sizeof(u32); 1140 xprt->tsh_size = sizeof(rpc_fraghdr) / sizeof(u32);
1142 xprt->cwnd = RPC_MAXCWND(xprt);
1143 xprt->resvport = capable(CAP_NET_BIND_SERVICE) ? 1 : 0; 1141 xprt->resvport = capable(CAP_NET_BIND_SERVICE) ? 1 : 0;
1144 xprt->max_payload = RPC_MAX_FRAGMENT_SIZE; 1142 xprt->max_payload = RPC_MAX_FRAGMENT_SIZE;
1145 1143