Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Linux-御风守护者
linux
提交
ba3f7f04
L
linux
项目概览
Linux-御风守护者
/
linux
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ba3f7f04
编写于
7月 17, 2012
作者:
D
David S. Miller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ipv4: Kill FLOWI_FLAG_RT_NOCACHE and associated code.
Signed-off-by:
N
David S. Miller
<
davem@davemloft.net
>
上级
d2d68ba9
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
5 addition
and
13 deletion
+5
-13
include/net/flow.h
include/net/flow.h
+0
-1
include/net/inet_connection_sock.h
include/net/inet_connection_sock.h
+1
-2
net/dccp/ipv4.c
net/dccp/ipv4.c
+1
-1
net/ipv4/inet_connection_sock.c
net/ipv4/inet_connection_sock.c
+1
-4
net/ipv4/route.c
net/ipv4/route.c
+0
-3
net/ipv4/tcp_ipv4.c
net/ipv4/tcp_ipv4.c
+2
-2
未找到文件。
include/net/flow.h
浏览文件 @
ba3f7f04
...
...
@@ -21,7 +21,6 @@ struct flowi_common {
__u8
flowic_flags
;
#define FLOWI_FLAG_ANYSRC 0x01
#define FLOWI_FLAG_CAN_SLEEP 0x02
#define FLOWI_FLAG_RT_NOCACHE 0x04
__u32
flowic_secid
;
};
...
...
include/net/inet_connection_sock.h
浏览文件 @
ba3f7f04
...
...
@@ -250,8 +250,7 @@ extern int inet_csk_get_port(struct sock *sk, unsigned short snum);
extern
struct
dst_entry
*
inet_csk_route_req
(
struct
sock
*
sk
,
struct
flowi4
*
fl4
,
const
struct
request_sock
*
req
,
bool
nocache
);
const
struct
request_sock
*
req
);
extern
struct
dst_entry
*
inet_csk_route_child_sock
(
struct
sock
*
sk
,
struct
sock
*
newsk
,
const
struct
request_sock
*
req
);
...
...
net/dccp/ipv4.c
浏览文件 @
ba3f7f04
...
...
@@ -508,7 +508,7 @@ static int dccp_v4_send_response(struct sock *sk, struct request_sock *req,
struct
dst_entry
*
dst
;
struct
flowi4
fl4
;
dst
=
inet_csk_route_req
(
sk
,
&
fl4
,
req
,
false
);
dst
=
inet_csk_route_req
(
sk
,
&
fl4
,
req
);
if
(
dst
==
NULL
)
goto
out
;
...
...
net/ipv4/inet_connection_sock.c
浏览文件 @
ba3f7f04
...
...
@@ -368,8 +368,7 @@ EXPORT_SYMBOL(inet_csk_reset_keepalive_timer);
struct
dst_entry
*
inet_csk_route_req
(
struct
sock
*
sk
,
struct
flowi4
*
fl4
,
const
struct
request_sock
*
req
,
bool
nocache
)
const
struct
request_sock
*
req
)
{
struct
rtable
*
rt
;
const
struct
inet_request_sock
*
ireq
=
inet_rsk
(
req
);
...
...
@@ -377,8 +376,6 @@ struct dst_entry *inet_csk_route_req(struct sock *sk,
struct
net
*
net
=
sock_net
(
sk
);
int
flags
=
inet_sk_flowi_flags
(
sk
);
if
(
nocache
)
flags
|=
FLOWI_FLAG_RT_NOCACHE
;
flowi4_init_output
(
fl4
,
sk
->
sk_bound_dev_if
,
sk
->
sk_mark
,
RT_CONN_FLAGS
(
sk
),
RT_SCOPE_UNIVERSE
,
sk
->
sk_protocol
,
...
...
net/ipv4/route.c
浏览文件 @
ba3f7f04
...
...
@@ -1836,9 +1836,6 @@ static struct rtable *__mkroute_output(const struct fib_result *res,
rt_set_nexthop
(
rth
,
fl4
->
daddr
,
res
,
fnhe
,
fi
,
type
,
0
);
if
(
fl4
->
flowi4_flags
&
FLOWI_FLAG_RT_NOCACHE
)
rth
->
dst
.
flags
|=
DST_NOCACHE
;
return
rth
;
}
...
...
net/ipv4/tcp_ipv4.c
浏览文件 @
ba3f7f04
...
...
@@ -824,7 +824,7 @@ static int tcp_v4_send_synack(struct sock *sk, struct dst_entry *dst,
struct
sk_buff
*
skb
;
/* First, grab a route. */
if
(
!
dst
&&
(
dst
=
inet_csk_route_req
(
sk
,
&
fl4
,
req
,
nocache
))
==
NULL
)
if
(
!
dst
&&
(
dst
=
inet_csk_route_req
(
sk
,
&
fl4
,
req
))
==
NULL
)
return
-
1
;
skb
=
tcp_make_synack
(
sk
,
dst
,
req
,
rvp
);
...
...
@@ -1378,7 +1378,7 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
*/
if
(
tmp_opt
.
saw_tstamp
&&
tcp_death_row
.
sysctl_tw_recycle
&&
(
dst
=
inet_csk_route_req
(
sk
,
&
fl4
,
req
,
want_cookie
))
!=
NULL
&&
(
dst
=
inet_csk_route_req
(
sk
,
&
fl4
,
req
))
!=
NULL
&&
fl4
.
daddr
==
saddr
)
{
if
(
!
tcp_peer_is_proven
(
req
,
dst
,
true
))
{
NET_INC_STATS_BH
(
sock_net
(
sk
),
LINUX_MIB_PAWSPASSIVEREJECTED
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录