git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bluetooth: Convert debug files to actually use debugfs instead of sysfs
[pandora-kernel.git]
/
net
/
sunrpc
/
svcsock.c
diff --git
a/net/sunrpc/svcsock.c
b/net/sunrpc/svcsock.c
index
870929e
..
a29f259
100644
(file)
--- a/
net/sunrpc/svcsock.c
+++ b/
net/sunrpc/svcsock.c
@@
-968,6
+968,7
@@
static int svc_tcp_recv_record(struct svc_sock *svsk, struct svc_rqst *rqstp)
return len;
err_delete:
set_bit(XPT_CLOSE, &svsk->sk_xprt.xpt_flags);
return len;
err_delete:
set_bit(XPT_CLOSE, &svsk->sk_xprt.xpt_flags);
+ svc_xprt_received(&svsk->sk_xprt);
err_again:
return -EAGAIN;
}
err_again:
return -EAGAIN;
}
@@
-1357,7
+1358,7
@@
int svc_addsock(struct svc_serv *serv, const int fd, char *name_return,
if (!so)
return err;
if (!so)
return err;
- if (
so->sk->sk_family != AF_INET
)
+ if (
(so->sk->sk_family != PF_INET) && (so->sk->sk_family != PF_INET6)
)
err = -EAFNOSUPPORT;
else if (so->sk->sk_protocol != IPPROTO_TCP &&
so->sk->sk_protocol != IPPROTO_UDP)
err = -EAFNOSUPPORT;
else if (so->sk->sk_protocol != IPPROTO_TCP &&
so->sk->sk_protocol != IPPROTO_UDP)