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
9f728af3
Commit
9f728af3
authored
Dec 31, 2017
by
Christoph Hellwig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
net/atm: convert to ->poll_mask
Signed-off-by:
Christoph Hellwig
<
hch@lst.de
>
parent
f4335f52
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
11 deletions
+6
-11
net/atm/common.c
net/atm/common.c
+3
-8
net/atm/common.h
net/atm/common.h
+1
-1
net/atm/pvc.c
net/atm/pvc.c
+1
-1
net/atm/svc.c
net/atm/svc.c
+1
-1
No files found.
net/atm/common.c
View file @
9f728af3
...
...
@@ -648,16 +648,11 @@ int vcc_sendmsg(struct socket *sock, struct msghdr *m, size_t size)
return
error
;
}
__poll_t
vcc_poll
(
struct
file
*
file
,
struct
socket
*
sock
,
poll_table
*
wait
)
__poll_t
vcc_poll
_mask
(
struct
socket
*
sock
,
__poll_t
events
)
{
struct
sock
*
sk
=
sock
->
sk
;
struct
atm_vcc
*
vcc
;
__poll_t
mask
;
sock_poll_wait
(
file
,
sk_sleep
(
sk
),
wait
);
mask
=
0
;
vcc
=
ATM_SD
(
sock
);
struct
atm_vcc
*
vcc
=
ATM_SD
(
sock
);
__poll_t
mask
=
0
;
/* exceptional events */
if
(
sk
->
sk_err
)
...
...
net/atm/common.h
View file @
9f728af3
...
...
@@ -17,7 +17,7 @@ int vcc_connect(struct socket *sock, int itf, short vpi, int vci);
int
vcc_recvmsg
(
struct
socket
*
sock
,
struct
msghdr
*
msg
,
size_t
size
,
int
flags
);
int
vcc_sendmsg
(
struct
socket
*
sock
,
struct
msghdr
*
m
,
size_t
total_len
);
__poll_t
vcc_poll
(
struct
file
*
file
,
struct
socket
*
sock
,
poll_table
*
wait
);
__poll_t
vcc_poll
_mask
(
struct
socket
*
sock
,
__poll_t
events
);
int
vcc_ioctl
(
struct
socket
*
sock
,
unsigned
int
cmd
,
unsigned
long
arg
);
int
vcc_compat_ioctl
(
struct
socket
*
sock
,
unsigned
int
cmd
,
unsigned
long
arg
);
int
vcc_setsockopt
(
struct
socket
*
sock
,
int
level
,
int
optname
,
...
...
net/atm/pvc.c
View file @
9f728af3
...
...
@@ -113,7 +113,7 @@ static const struct proto_ops pvc_proto_ops = {
.
socketpair
=
sock_no_socketpair
,
.
accept
=
sock_no_accept
,
.
getname
=
pvc_getname
,
.
poll
=
vcc_poll
,
.
poll
_mask
=
vcc_poll_mask
,
.
ioctl
=
vcc_ioctl
,
#ifdef CONFIG_COMPAT
.
compat_ioctl
=
vcc_compat_ioctl
,
...
...
net/atm/svc.c
View file @
9f728af3
...
...
@@ -636,7 +636,7 @@ static const struct proto_ops svc_proto_ops = {
.
socketpair
=
sock_no_socketpair
,
.
accept
=
svc_accept
,
.
getname
=
svc_getname
,
.
poll
=
vcc_poll
,
.
poll
_mask
=
vcc_poll_mask
,
.
ioctl
=
svc_ioctl
,
#ifdef CONFIG_COMPAT
.
compat_ioctl
=
svc_compat_ioctl
,
...
...
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