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
Kirill Smelkov
linux
Commits
9490e40a
Commit
9490e40a
authored
Dec 31, 2017
by
Christoph Hellwig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
net/caif: convert to ->poll_mask
Signed-off-by:
Christoph Hellwig
<
hch@lst.de
>
parent
17112d80
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
8 deletions
+4
-8
net/caif/caif_socket.c
net/caif/caif_socket.c
+4
-8
No files found.
net/caif/caif_socket.c
View file @
9490e40a
...
@@ -934,15 +934,11 @@ static int caif_release(struct socket *sock)
...
@@ -934,15 +934,11 @@ static int caif_release(struct socket *sock)
}
}
/* Copied from af_unix.c:unix_poll(), added CAIF tx_flow handling */
/* Copied from af_unix.c:unix_poll(), added CAIF tx_flow handling */
static
__poll_t
caif_poll
(
struct
file
*
file
,
static
__poll_t
caif_poll_mask
(
struct
socket
*
sock
,
__poll_t
events
)
struct
socket
*
sock
,
poll_table
*
wait
)
{
{
struct
sock
*
sk
=
sock
->
sk
;
struct
sock
*
sk
=
sock
->
sk
;
__poll_t
mask
;
struct
caifsock
*
cf_sk
=
container_of
(
sk
,
struct
caifsock
,
sk
);
struct
caifsock
*
cf_sk
=
container_of
(
sk
,
struct
caifsock
,
sk
);
__poll_t
mask
=
0
;
sock_poll_wait
(
file
,
sk_sleep
(
sk
),
wait
);
mask
=
0
;
/* exceptional events? */
/* exceptional events? */
if
(
sk
->
sk_err
)
if
(
sk
->
sk_err
)
...
@@ -976,7 +972,7 @@ static const struct proto_ops caif_seqpacket_ops = {
...
@@ -976,7 +972,7 @@ static const struct proto_ops caif_seqpacket_ops = {
.
socketpair
=
sock_no_socketpair
,
.
socketpair
=
sock_no_socketpair
,
.
accept
=
sock_no_accept
,
.
accept
=
sock_no_accept
,
.
getname
=
sock_no_getname
,
.
getname
=
sock_no_getname
,
.
poll
=
caif_poll
,
.
poll
_mask
=
caif_poll_mask
,
.
ioctl
=
sock_no_ioctl
,
.
ioctl
=
sock_no_ioctl
,
.
listen
=
sock_no_listen
,
.
listen
=
sock_no_listen
,
.
shutdown
=
sock_no_shutdown
,
.
shutdown
=
sock_no_shutdown
,
...
@@ -997,7 +993,7 @@ static const struct proto_ops caif_stream_ops = {
...
@@ -997,7 +993,7 @@ static const struct proto_ops caif_stream_ops = {
.
socketpair
=
sock_no_socketpair
,
.
socketpair
=
sock_no_socketpair
,
.
accept
=
sock_no_accept
,
.
accept
=
sock_no_accept
,
.
getname
=
sock_no_getname
,
.
getname
=
sock_no_getname
,
.
poll
=
caif_poll
,
.
poll
_mask
=
caif_poll_mask
,
.
ioctl
=
sock_no_ioctl
,
.
ioctl
=
sock_no_ioctl
,
.
listen
=
sock_no_listen
,
.
listen
=
sock_no_listen
,
.
shutdown
=
sock_no_shutdown
,
.
shutdown
=
sock_no_shutdown
,
...
...
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