Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
568ea88e
Commit
568ea88e
authored
Dec 31, 2017
by
Christoph Hellwig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
net/sctp: convert to ->poll_mask
Signed-off-by:
Christoph Hellwig
<
hch@lst.de
>
parent
4df7338f
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
7 deletions
+4
-7
include/net/sctp/sctp.h
include/net/sctp/sctp.h
+1
-2
net/sctp/ipv6.c
net/sctp/ipv6.c
+1
-1
net/sctp/protocol.c
net/sctp/protocol.c
+1
-1
net/sctp/socket.c
net/sctp/socket.c
+1
-3
No files found.
include/net/sctp/sctp.h
View file @
568ea88e
...
...
@@ -107,8 +107,7 @@ int sctp_backlog_rcv(struct sock *sk, struct sk_buff *skb);
int
sctp_inet_listen
(
struct
socket
*
sock
,
int
backlog
);
void
sctp_write_space
(
struct
sock
*
sk
);
void
sctp_data_ready
(
struct
sock
*
sk
);
__poll_t
sctp_poll
(
struct
file
*
file
,
struct
socket
*
sock
,
poll_table
*
wait
);
__poll_t
sctp_poll_mask
(
struct
socket
*
sock
,
__poll_t
events
);
void
sctp_sock_rfree
(
struct
sk_buff
*
skb
);
void
sctp_copy_sock
(
struct
sock
*
newsk
,
struct
sock
*
sk
,
struct
sctp_association
*
asoc
);
...
...
net/sctp/ipv6.c
View file @
568ea88e
...
...
@@ -1007,7 +1007,7 @@ static const struct proto_ops inet6_seqpacket_ops = {
.
socketpair
=
sock_no_socketpair
,
.
accept
=
inet_accept
,
.
getname
=
sctp_getname
,
.
poll
=
sctp_poll
,
.
poll
_mask
=
sctp_poll_mask
,
.
ioctl
=
inet6_ioctl
,
.
listen
=
sctp_inet_listen
,
.
shutdown
=
inet_shutdown
,
...
...
net/sctp/protocol.c
View file @
568ea88e
...
...
@@ -1016,7 +1016,7 @@ static const struct proto_ops inet_seqpacket_ops = {
.
socketpair
=
sock_no_socketpair
,
.
accept
=
inet_accept
,
.
getname
=
inet_getname
,
/* Semantics are different. */
.
poll
=
sctp_poll
,
.
poll
_mask
=
sctp_poll_mask
,
.
ioctl
=
inet_ioctl
,
.
listen
=
sctp_inet_listen
,
.
shutdown
=
inet_shutdown
,
/* Looks harmless. */
...
...
net/sctp/socket.c
View file @
568ea88e
...
...
@@ -7701,14 +7701,12 @@ int sctp_inet_listen(struct socket *sock, int backlog)
* here, again, by modeling the current TCP/UDP code. We don't have
* a good way to test with it yet.
*/
__poll_t
sctp_poll
(
struct
file
*
file
,
struct
socket
*
sock
,
poll_table
*
wait
)
__poll_t
sctp_poll
_mask
(
struct
socket
*
sock
,
__poll_t
events
)
{
struct
sock
*
sk
=
sock
->
sk
;
struct
sctp_sock
*
sp
=
sctp_sk
(
sk
);
__poll_t
mask
;
poll_wait
(
file
,
sk_sleep
(
sk
),
wait
);
sock_rps_record_flow
(
sk
);
/* A TCP-style listening socket becomes readable when the accept queue
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment