projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'nds32-for-linus-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-microblaze.git]
/
net
/
dccp
/
ipv6.c
diff --git
a/net/dccp/ipv6.c
b/net/dccp/ipv6.c
index
17fc4e0
..
6344f1b
100644
(file)
--- a/
net/dccp/ipv6.c
+++ b/
net/dccp/ipv6.c
@@
-1070,7
+1070,7
@@
static const struct proto_ops inet6_dccp_ops = {
.socketpair = sock_no_socketpair,
.accept = inet_accept,
.getname = inet6_getname,
- .poll
_mask = dccp_poll_mask
,
+ .poll
= dccp_poll
,
.ioctl = inet6_ioctl,
.listen = inet_dccp_listen,
.shutdown = inet_shutdown,