Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
kernel_linux
提交
f6ff56cd
K
kernel_linux
项目概览
OpenHarmony
/
kernel_linux
上一次同步 大约 4 年
通知
14
Star
8
Fork
2
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
kernel_linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
f6ff56cd
编写于
11月 15, 2005
作者:
L
Linus Torvalds
浏览文件
操作
浏览文件
下载
差异文件
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
上级
fb6d73d3
5a6f294e
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
32 addition
and
19 deletion
+32
-19
include/net/llc_pdu.h
include/net/llc_pdu.h
+1
-1
include/net/tcp.h
include/net/tcp.h
+2
-2
net/ipv4/tcp_input.c
net/ipv4/tcp_input.c
+2
-2
net/ipv6/addrconf.c
net/ipv6/addrconf.c
+3
-2
net/ipv6/ipv6_sockglue.c
net/ipv6/ipv6_sockglue.c
+1
-1
net/llc/af_llc.c
net/llc/af_llc.c
+4
-1
net/llc/llc_c_ac.c
net/llc/llc_c_ac.c
+11
-9
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_conntrack_core.c
+7
-0
net/netfilter/nf_conntrack_standalone.c
net/netfilter/nf_conntrack_standalone.c
+1
-1
未找到文件。
include/net/llc_pdu.h
浏览文件 @
f6ff56cd
...
...
@@ -357,7 +357,7 @@ static inline void llc_pdu_init_as_test_rsp(struct sk_buff *skb,
/* LLC Type 1 XID command/response information fields format */
struct
llc_xid_info
{
u8
fmt_id
;
/* always 0x
18
for LLC */
u8
fmt_id
;
/* always 0x
81
for LLC */
u8
type
;
/* different if NULL/non-NULL LSAP */
u8
rw
;
/* sender receive window */
};
...
...
include/net/tcp.h
浏览文件 @
f6ff56cd
...
...
@@ -552,8 +552,8 @@ extern u32 __tcp_select_window(struct sock *sk);
/* TCP timestamps are only 32-bits, this causes a slight
* complication on 64-bit systems since we store a snapshot
* of jiffies in the buffer control blocks below. We decided
ly
*
only use of
the low 32-bits of jiffies and hide the ugly
* of jiffies in the buffer control blocks below. We decided
*
to use only
the low 32-bits of jiffies and hide the ugly
* casts with the following macro.
*/
#define tcp_time_stamp ((__u32)(jiffies))
...
...
net/ipv4/tcp_input.c
浏览文件 @
f6ff56cd
...
...
@@ -367,7 +367,7 @@ static void tcp_rcv_rtt_update(struct tcp_sock *tp, u32 sample, int win_dep)
* are stalled on filesystem I/O.
*
* Also, since we are only going for a minimum in the
* non-timestamp case, we do not smooth
er
things out
* non-timestamp case, we do not smooth things out
* else with timestamps disabled convergence takes too
* long.
*/
...
...
@@ -546,7 +546,7 @@ static void tcp_rtt_estimator(struct sock *sk, const __u32 mrtt)
*
* Funny. This algorithm seems to be very broken.
* These formulae increase RTO, when it should be decreased, increase
* too slowly, when it should be increased
fastly, decrease too fast
ly
* too slowly, when it should be increased
quickly, decrease too quick
ly
* etc. I guess in BSD RTO takes ONE value, so that it is absolutely
* does not matter how to _calculate_ it. Seems, it was trap
* that VJ failed to avoid. 8)
...
...
net/ipv6/addrconf.c
浏览文件 @
f6ff56cd
...
...
@@ -1045,9 +1045,10 @@ int ipv6_dev_get_saddr(struct net_device *daddr_dev,
}
#endif
/* Rule 8: Use longest matching prefix */
if
(
hiscore
.
rule
<
8
)
if
(
hiscore
.
rule
<
8
)
{
hiscore
.
matchlen
=
ipv6_addr_diff
(
&
ifa_result
->
addr
,
daddr
);
score
.
rule
++
;
hiscore
.
rule
++
;
}
score
.
matchlen
=
ipv6_addr_diff
(
&
ifa
->
addr
,
daddr
);
if
(
score
.
matchlen
>
hiscore
.
matchlen
)
{
score
.
rule
=
8
;
...
...
net/ipv6/ipv6_sockglue.c
浏览文件 @
f6ff56cd
...
...
@@ -287,7 +287,7 @@ int ipv6_setsockopt(struct sock *sk, int level, int optname,
{
struct
ipv6_txoptions
*
opt
;
if
(
optlen
==
0
)
optval
=
0
;
optval
=
NULL
;
/* hop-by-hop / destination options are privileged option */
retv
=
-
EPERM
;
...
...
net/llc/af_llc.c
浏览文件 @
f6ff56cd
...
...
@@ -116,7 +116,9 @@ static int llc_ui_send_data(struct sock* sk, struct sk_buff *skb, int noblock)
struct
llc_sock
*
llc
=
llc_sk
(
sk
);
int
rc
=
0
;
if
(
unlikely
(
llc_data_accept_state
(
llc
->
state
)
||
llc
->
p_flag
))
{
if
(
unlikely
(
llc_data_accept_state
(
llc
->
state
)
||
llc
->
remote_busy_flag
||
llc
->
p_flag
))
{
long
timeout
=
sock_sndtimeo
(
sk
,
noblock
);
rc
=
llc_ui_wait_for_busy_core
(
sk
,
timeout
);
...
...
@@ -542,6 +544,7 @@ static int llc_ui_wait_for_busy_core(struct sock *sk, long timeout)
if
(
sk_wait_event
(
sk
,
&
timeout
,
(
sk
->
sk_shutdown
&
RCV_SHUTDOWN
)
||
(
!
llc_data_accept_state
(
llc
->
state
)
&&
!
llc
->
remote_busy_flag
&&
!
llc
->
p_flag
)))
break
;
rc
=
-
ERESTARTSYS
;
...
...
net/llc/llc_c_ac.c
浏览文件 @
f6ff56cd
...
...
@@ -866,7 +866,8 @@ int llc_conn_ac_send_ack_if_needed(struct sock *sk, struct sk_buff *skb)
llc
->
ack_must_be_send
=
1
;
llc
->
ack_pf
=
pf_bit
&
1
;
}
if
(((
llc
->
vR
-
llc
->
first_pdu_Ns
+
129
)
%
128
)
>=
llc
->
npta
)
{
if
(((
llc
->
vR
-
llc
->
first_pdu_Ns
+
1
+
LLC_2_SEQ_NBR_MODULO
)
%
LLC_2_SEQ_NBR_MODULO
)
>=
llc
->
npta
)
{
llc_conn_ac_send_rr_rsp_f_set_ackpf
(
sk
,
skb
);
llc
->
ack_must_be_send
=
0
;
llc
->
ack_pf
=
0
;
...
...
@@ -994,8 +995,8 @@ static int llc_conn_ac_inc_npta_value(struct sock *sk, struct sk_buff *skb)
llc
->
dec_step
=
0
;
llc
->
dec_cntr
=
llc
->
inc_cntr
=
2
;
++
llc
->
npta
;
if
(
llc
->
npta
>
127
)
llc
->
npta
=
127
;
if
(
llc
->
npta
>
~
LLC_2_SEQ_NBR_MODULO
)
llc
->
npta
=
~
LLC_2_SEQ_NBR_MODULO
;
}
else
--
llc
->
inc_cntr
;
return
0
;
...
...
@@ -1065,9 +1066,10 @@ int llc_conn_ac_dec_tx_win_size(struct sock *sk, struct sk_buff *skb)
struct
llc_sock
*
llc
=
llc_sk
(
sk
);
u8
unacked_pdu
=
skb_queue_len
(
&
llc
->
pdu_unack_q
);
llc
->
k
-=
unacked_pdu
;
if
(
llc
->
k
<
2
)
llc
->
k
=
2
;
if
(
llc
->
k
-
unacked_pdu
<
1
)
llc
->
k
=
1
;
else
llc
->
k
-=
unacked_pdu
;
return
0
;
}
...
...
@@ -1084,8 +1086,8 @@ int llc_conn_ac_inc_tx_win_size(struct sock *sk, struct sk_buff *skb)
struct
llc_sock
*
llc
=
llc_sk
(
sk
);
llc
->
k
+=
1
;
if
(
llc
->
k
>
128
)
llc
->
k
=
128
;
if
(
llc
->
k
>
~
LLC_2_SEQ_NBR_MODULO
)
llc
->
k
=
~
LLC_2_SEQ_NBR_MODULO
;
return
0
;
}
...
...
@@ -1309,7 +1311,7 @@ int llc_conn_ac_set_vs_nr(struct sock *sk, struct sk_buff *skb)
static
int
llc_conn_ac_inc_vs_by_1
(
struct
sock
*
sk
,
struct
sk_buff
*
skb
)
{
llc_sk
(
sk
)
->
vS
=
(
llc_sk
(
sk
)
->
vS
+
1
)
%
128
;
llc_sk
(
sk
)
->
vS
=
(
llc_sk
(
sk
)
->
vS
+
1
)
%
LLC_2_SEQ_NBR_MODULO
;
return
0
;
}
...
...
net/netfilter/nf_conntrack_core.c
浏览文件 @
f6ff56cd
...
...
@@ -1395,6 +1395,13 @@ void nf_conntrack_cleanup(void)
kmem_cache_destroy
(
nf_conntrack_expect_cachep
);
free_conntrack_hash
(
nf_conntrack_hash
,
nf_conntrack_vmalloc
,
nf_conntrack_htable_size
);
/* free l3proto protocol tables */
for
(
i
=
0
;
i
<
PF_MAX
;
i
++
)
if
(
nf_ct_protos
[
i
])
{
kfree
(
nf_ct_protos
[
i
]);
nf_ct_protos
[
i
]
=
NULL
;
}
}
static
struct
list_head
*
alloc_hashtable
(
int
size
,
int
*
vmalloced
)
...
...
net/netfilter/nf_conntrack_standalone.c
浏览文件 @
f6ff56cd
...
...
@@ -694,7 +694,7 @@ static int init_or_cleanup(int init)
cleanup_proc_stat:
#endif
#ifdef CONFIG_PROC_FS
proc_net_remove
(
"nf_conntrack_stat"
);
remove_proc_entry
(
"nf_conntrack"
,
proc_net_stat
);
cleanup_proc_exp:
proc_net_remove
(
"nf_conntrack_expect"
);
cleanup_proc:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录