Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
f4335f52
K
Kernel
项目概览
openeuler
/
Kernel
大约 1 年 前同步成功
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
Kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f4335f52
编写于
12月 31, 2017
作者:
C
Christoph Hellwig
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
net/dccp: convert to ->poll_mask
Signed-off-by:
N
Christoph Hellwig
<
hch@lst.de
>
上级
db5051ea
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
5 addition
and
15 deletion
+5
-15
net/dccp/dccp.h
net/dccp/dccp.h
+1
-2
net/dccp/ipv4.c
net/dccp/ipv4.c
+1
-1
net/dccp/ipv6.c
net/dccp/ipv6.c
+1
-1
net/dccp/proto.c
net/dccp/proto.c
+2
-11
未找到文件。
net/dccp/dccp.h
浏览文件 @
f4335f52
...
...
@@ -316,8 +316,7 @@ int dccp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int nonblock,
int
flags
,
int
*
addr_len
);
void
dccp_shutdown
(
struct
sock
*
sk
,
int
how
);
int
inet_dccp_listen
(
struct
socket
*
sock
,
int
backlog
);
__poll_t
dccp_poll
(
struct
file
*
file
,
struct
socket
*
sock
,
poll_table
*
wait
);
__poll_t
dccp_poll_mask
(
struct
socket
*
sock
,
__poll_t
events
);
int
dccp_v4_connect
(
struct
sock
*
sk
,
struct
sockaddr
*
uaddr
,
int
addr_len
);
void
dccp_req_err
(
struct
sock
*
sk
,
u64
seq
);
...
...
net/dccp/ipv4.c
浏览文件 @
f4335f52
...
...
@@ -984,7 +984,7 @@ static const struct proto_ops inet_dccp_ops = {
.
accept
=
inet_accept
,
.
getname
=
inet_getname
,
/* FIXME: work on tcp_poll to rename it to inet_csk_poll */
.
poll
=
dccp_poll
,
.
poll
_mask
=
dccp_poll_mask
,
.
ioctl
=
inet_ioctl
,
/* FIXME: work on inet_listen to rename it to sock_common_listen */
.
listen
=
inet_dccp_listen
,
...
...
net/dccp/ipv6.c
浏览文件 @
f4335f52
...
...
@@ -1070,7 +1070,7 @@ static const struct proto_ops inet6_dccp_ops = {
.
socketpair
=
sock_no_socketpair
,
.
accept
=
inet_accept
,
.
getname
=
inet6_getname
,
.
poll
=
dccp_poll
,
.
poll
_mask
=
dccp_poll_mask
,
.
ioctl
=
inet6_ioctl
,
.
listen
=
inet_dccp_listen
,
.
shutdown
=
inet_shutdown
,
...
...
net/dccp/proto.c
浏览文件 @
f4335f52
...
...
@@ -314,20 +314,11 @@ int dccp_disconnect(struct sock *sk, int flags)
EXPORT_SYMBOL_GPL
(
dccp_disconnect
);
/*
* Wait for a DCCP event.
*
* Note that we don't need to lock the socket, as the upper poll layers
* take care of normal races (between the test and the event) and we don't
* go look at any of the socket buffers directly.
*/
__poll_t
dccp_poll
(
struct
file
*
file
,
struct
socket
*
sock
,
poll_table
*
wait
)
__poll_t
dccp_poll_mask
(
struct
socket
*
sock
,
__poll_t
events
)
{
__poll_t
mask
;
struct
sock
*
sk
=
sock
->
sk
;
sock_poll_wait
(
file
,
sk_sleep
(
sk
),
wait
);
if
(
sk
->
sk_state
==
DCCP_LISTEN
)
return
inet_csk_listen_poll
(
sk
);
...
...
@@ -369,7 +360,7 @@ __poll_t dccp_poll(struct file *file, struct socket *sock,
return
mask
;
}
EXPORT_SYMBOL_GPL
(
dccp_poll
);
EXPORT_SYMBOL_GPL
(
dccp_poll
_mask
);
int
dccp_ioctl
(
struct
sock
*
sk
,
int
cmd
,
unsigned
long
arg
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录