aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTom Tucker <tom@opengridcomputing.com>2007-12-30 22:07:23 -0500
committerJ. Bruce Fields <bfields@citi.umich.edu>2008-02-01 16:42:08 -0500
commit5d137990f5860451a6e0428e0903f62933d05287 (patch)
tree71f57e8a13138530c8c82f9de19067687d0b428d /include
parent490231558e058547da4ffab6d8ce8e28771749cc (diff)
svc: Move sk_sendto and sk_recvfrom to svc_xprt_class
The sk_sendto and sk_recvfrom are function pointers that allow svc_sock to be used for both UDP and TCP. Move these function pointers to the svc_xprt_ops structure. Signed-off-by: Tom Tucker <tom@opengridcomputing.com> Acked-by: Neil Brown <neilb@suse.de> Reviewed-by: Chuck Lever <chuck.lever@oracle.com> Reviewed-by: Greg Banks <gnb@sgi.com> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'include')
-rw-r--r--include/linux/sunrpc/svc_xprt.h2
-rw-r--r--include/linux/sunrpc/svcsock.h3
2 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/sunrpc/svc_xprt.h b/include/linux/sunrpc/svc_xprt.h
index 187dc4e2e202..7ae6c857b05d 100644
--- a/include/linux/sunrpc/svc_xprt.h
+++ b/include/linux/sunrpc/svc_xprt.h
@@ -10,6 +10,8 @@
10#include <linux/sunrpc/svc.h> 10#include <linux/sunrpc/svc.h>
11 11
12struct svc_xprt_ops { 12struct svc_xprt_ops {
13 int (*xpo_recvfrom)(struct svc_rqst *);
14 int (*xpo_sendto)(struct svc_rqst *);
13}; 15};
14 16
15struct svc_xprt_class { 17struct svc_xprt_class {
diff --git a/include/linux/sunrpc/svcsock.h b/include/linux/sunrpc/svcsock.h
index 1878cbe1aa4f..08e78d0a364f 100644
--- a/include/linux/sunrpc/svcsock.h
+++ b/include/linux/sunrpc/svcsock.h
@@ -45,9 +45,6 @@ struct svc_sock {
45 * be revisted */ 45 * be revisted */
46 struct mutex sk_mutex; /* to serialize sending data */ 46 struct mutex sk_mutex; /* to serialize sending data */
47 47
48 int (*sk_recvfrom)(struct svc_rqst *rqstp);
49 int (*sk_sendto)(struct svc_rqst *rqstp);
50
51 /* We keep the old state_change and data_ready CB's here */ 48 /* We keep the old state_change and data_ready CB's here */
52 void (*sk_ostate)(struct sock *); 49 void (*sk_ostate)(struct sock *);
53 void (*sk_odata)(struct sock *, int bytes); 50 void (*sk_odata)(struct sock *, int bytes);