diff options
Diffstat (limited to 'net/sunrpc/xprtsock.c')
-rw-r--r-- | net/sunrpc/xprtsock.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 06c2d95484e0..2e1529217e65 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c | |||
@@ -865,15 +865,7 @@ static void xs_tcp_write_space(struct sock *sk) | |||
865 | read_unlock(&sk->sk_callback_lock); | 865 | read_unlock(&sk->sk_callback_lock); |
866 | } | 866 | } |
867 | 867 | ||
868 | /** | 868 | static void xs_udp_do_set_buffer_size(struct rpc_xprt *xprt) |
869 | * xs_udp_set_buffer_size - set send and receive limits | ||
870 | * @xprt: generic transport | ||
871 | * | ||
872 | * Set socket send and receive limits based on the | ||
873 | * sndsize and rcvsize fields in the generic transport | ||
874 | * structure. | ||
875 | */ | ||
876 | static void xs_udp_set_buffer_size(struct rpc_xprt *xprt) | ||
877 | { | 869 | { |
878 | struct sock *sk = xprt->inet; | 870 | struct sock *sk = xprt->inet; |
879 | 871 | ||
@@ -889,14 +881,23 @@ static void xs_udp_set_buffer_size(struct rpc_xprt *xprt) | |||
889 | } | 881 | } |
890 | 882 | ||
891 | /** | 883 | /** |
892 | * xs_tcp_set_buffer_size - set send and receive limits | 884 | * xs_udp_set_buffer_size - set send and receive limits |
893 | * @xprt: generic transport | 885 | * @xprt: generic transport |
886 | * @sndsize: requested size of send buffer, in bytes | ||
887 | * @rcvsize: requested size of receive buffer, in bytes | ||
894 | * | 888 | * |
895 | * Nothing to do for TCP. | 889 | * Set socket send and receive buffer size limits. |
896 | */ | 890 | */ |
897 | static void xs_tcp_set_buffer_size(struct rpc_xprt *xprt) | 891 | static void xs_udp_set_buffer_size(struct rpc_xprt *xprt, size_t sndsize, size_t rcvsize) |
898 | { | 892 | { |
899 | return; | 893 | xprt->sndsize = 0; |
894 | if (sndsize) | ||
895 | xprt->sndsize = sndsize + 1024; | ||
896 | xprt->rcvsize = 0; | ||
897 | if (rcvsize) | ||
898 | xprt->rcvsize = rcvsize + 1024; | ||
899 | |||
900 | xs_udp_do_set_buffer_size(xprt); | ||
900 | } | 901 | } |
901 | 902 | ||
902 | /** | 903 | /** |
@@ -989,7 +990,7 @@ static void xs_udp_connect_worker(void *args) | |||
989 | 990 | ||
990 | write_unlock_bh(&sk->sk_callback_lock); | 991 | write_unlock_bh(&sk->sk_callback_lock); |
991 | } | 992 | } |
992 | xs_udp_set_buffer_size(xprt); | 993 | xs_udp_do_set_buffer_size(xprt); |
993 | status = 0; | 994 | status = 0; |
994 | out: | 995 | out: |
995 | xprt_wake_pending_tasks(xprt, status); | 996 | xprt_wake_pending_tasks(xprt, status); |
@@ -1158,7 +1159,6 @@ static struct rpc_xprt_ops xs_udp_ops = { | |||
1158 | }; | 1159 | }; |
1159 | 1160 | ||
1160 | static struct rpc_xprt_ops xs_tcp_ops = { | 1161 | static struct rpc_xprt_ops xs_tcp_ops = { |
1161 | .set_buffer_size = xs_tcp_set_buffer_size, | ||
1162 | .reserve_xprt = xprt_reserve_xprt, | 1162 | .reserve_xprt = xprt_reserve_xprt, |
1163 | .release_xprt = xprt_release_xprt, | 1163 | .release_xprt = xprt_release_xprt, |
1164 | .connect = xs_connect, | 1164 | .connect = xs_connect, |