Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b7872fe86db78cc96c85a13338ea6e3fe1aef610

Authored by Chuck Lever
Committed by J. Bruce Fields
1 parent f97c650dda
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

SUNRPC: RPC server still uses 2.4 method for disabling TCP Nagle 

Use the 2.6 method for disabling TCP Nagle in the kernel's RPC server.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

net/sunrpc/svcsock.c
Diff comments   View file @ b7872fe
... ... @@ -38,6 +38,7 @@
38 38 #include <net/checksum.h>
39 39 #include <net/ip.h>
40 40 #include <net/ipv6.h>
  41 +#include <net/tcp.h>
41 42 #include <net/tcp_states.h>
42 43 #include <asm/uaccess.h>
43 44 #include <asm/ioctls.h>
... ... @@ -1045,7 +1046,6 @@
1045 1046 static void svc_tcp_init(struct svc_sock *svsk, struct svc_serv *serv)
1046 1047 {
1047 1048 struct sock *sk = svsk->sk_sk;
1048   - struct tcp_sock *tp = tcp_sk(sk);
1049 1049  
1050 1050 svc_xprt_init(&svc_tcp_class, &svsk->sk_xprt, serv);
1051 1051 set_bit(XPT_CACHE_AUTH, &svsk->sk_xprt.xpt_flags);
... ... @@ -1063,7 +1063,7 @@
1063 1063 svsk->sk_reclen = 0;
1064 1064 svsk->sk_tcplen = 0;
1065 1065  
1066   - tp->nonagle = 1; /* disable Nagle's algorithm */
  1066 + tcp_sk(sk)->nonagle |= TCP_NAGLE_OFF;
1067 1067  
1068 1068 /* initialise setting must have enough space to
1069 1069 * receive and respond to one request.