Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
42f9cabe
K
Kernel
项目概览
openeuler
/
Kernel
12 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
42f9cabe
编写于
11月 17, 2005
作者:
L
Linus Torvalds
浏览文件
操作
浏览文件
下载
差异文件
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
上级
97616449
9e147a1c
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
20 addition
and
41 deletion
+20
-41
net/ipv4/netfilter/ip_conntrack_ftp.c
net/ipv4/netfilter/ip_conntrack_ftp.c
+2
-2
net/ipv4/netfilter/ip_conntrack_irc.c
net/ipv4/netfilter/ip_conntrack_irc.c
+2
-2
net/ipv4/netfilter/ip_conntrack_tftp.c
net/ipv4/netfilter/ip_conntrack_tftp.c
+2
-2
net/ipv4/tcp_highspeed.c
net/ipv4/tcp_highspeed.c
+1
-1
net/ipv6/route.c
net/ipv6/route.c
+1
-1
net/llc/llc_c_ac.c
net/llc/llc_c_ac.c
+4
-4
net/sched/Kconfig
net/sched/Kconfig
+8
-29
未找到文件。
net/ipv4/netfilter/ip_conntrack_ftp.c
浏览文件 @
42f9cabe
...
...
@@ -29,9 +29,9 @@ static char *ftp_buffer;
static
DEFINE_SPINLOCK
(
ip_ftp_lock
);
#define MAX_PORTS 8
static
short
ports
[
MAX_PORTS
];
static
unsigned
short
ports
[
MAX_PORTS
];
static
int
ports_c
;
module_param_array
(
ports
,
short
,
&
ports_c
,
0400
);
module_param_array
(
ports
,
u
short
,
&
ports_c
,
0400
);
static
int
loose
;
module_param
(
loose
,
int
,
0600
);
...
...
net/ipv4/netfilter/ip_conntrack_irc.c
浏览文件 @
42f9cabe
...
...
@@ -34,7 +34,7 @@
#include <linux/moduleparam.h>
#define MAX_PORTS 8
static
short
ports
[
MAX_PORTS
];
static
unsigned
short
ports
[
MAX_PORTS
];
static
int
ports_c
;
static
int
max_dcc_channels
=
8
;
static
unsigned
int
dcc_timeout
=
300
;
...
...
@@ -52,7 +52,7 @@ EXPORT_SYMBOL_GPL(ip_nat_irc_hook);
MODULE_AUTHOR
(
"Harald Welte <laforge@netfilter.org>"
);
MODULE_DESCRIPTION
(
"IRC (DCC) connection tracking helper"
);
MODULE_LICENSE
(
"GPL"
);
module_param_array
(
ports
,
short
,
&
ports_c
,
0400
);
module_param_array
(
ports
,
u
short
,
&
ports_c
,
0400
);
MODULE_PARM_DESC
(
ports
,
"port numbers of IRC servers"
);
module_param
(
max_dcc_channels
,
int
,
0400
);
MODULE_PARM_DESC
(
max_dcc_channels
,
"max number of expected DCC channels per IRC session"
);
...
...
net/ipv4/netfilter/ip_conntrack_tftp.c
浏览文件 @
42f9cabe
...
...
@@ -26,9 +26,9 @@ MODULE_DESCRIPTION("tftp connection tracking helper");
MODULE_LICENSE
(
"GPL"
);
#define MAX_PORTS 8
static
short
ports
[
MAX_PORTS
];
static
unsigned
short
ports
[
MAX_PORTS
];
static
int
ports_c
;
module_param_array
(
ports
,
short
,
&
ports_c
,
0400
);
module_param_array
(
ports
,
u
short
,
&
ports_c
,
0400
);
MODULE_PARM_DESC
(
ports
,
"port numbers of tftp servers"
);
#if 0
...
...
net/ipv4/tcp_highspeed.c
浏览文件 @
42f9cabe
...
...
@@ -111,7 +111,7 @@ static void hstcp_init(struct sock *sk)
}
static
void
hstcp_cong_avoid
(
struct
sock
*
sk
,
u32
adk
,
u32
rtt
,
u32
in_flight
,
u32
pkts
_acked
)
u32
in_flight
,
int
data
_acked
)
{
struct
tcp_sock
*
tp
=
tcp_sk
(
sk
);
struct
hstcp
*
ca
=
inet_csk_ca
(
sk
);
...
...
net/ipv6/route.c
浏览文件 @
42f9cabe
...
...
@@ -1732,7 +1732,7 @@ int inet6_dump_fib(struct sk_buff *skb, struct netlink_callback *cb)
/*
* 2. allocate and initialize walker.
*/
w
=
kmalloc
(
sizeof
(
*
w
),
GFP_
KERNEL
);
w
=
kmalloc
(
sizeof
(
*
w
),
GFP_
ATOMIC
);
if
(
w
==
NULL
)
return
-
ENOMEM
;
RT6_TRACE
(
"dump<%p"
,
w
);
...
...
net/llc/llc_c_ac.c
浏览文件 @
42f9cabe
...
...
@@ -995,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
>
~
LLC_2_SEQ_NBR_MODULO
)
llc
->
npta
=
~
LLC_2_SEQ_NBR_MODULO
;
if
(
llc
->
npta
>
(
u8
)
~
LLC_2_SEQ_NBR_MODULO
)
llc
->
npta
=
(
u8
)
~
LLC_2_SEQ_NBR_MODULO
;
}
else
--
llc
->
inc_cntr
;
return
0
;
...
...
@@ -1086,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
>
~
LLC_2_SEQ_NBR_MODULO
)
llc
->
k
=
~
LLC_2_SEQ_NBR_MODULO
;
if
(
llc
->
k
>
(
u8
)
~
LLC_2_SEQ_NBR_MODULO
)
llc
->
k
=
(
u8
)
~
LLC_2_SEQ_NBR_MODULO
;
return
0
;
}
...
...
net/sched/Kconfig
浏览文件 @
42f9cabe
...
...
@@ -40,9 +40,10 @@ config NET_SCHED
The available schedulers are listed in the following questions; you
can say Y to as many as you like. If unsure, say N now.
if NET_SCHED
choice
prompt "Packet scheduler clock source"
depends on NET_SCHED
default NET_SCH_CLK_JIFFIES
---help---
Packet schedulers need a monotonic clock that increments at a static
...
...
@@ -98,11 +99,9 @@ config NET_SCH_CLK_CPU
endchoice
comment "Queueing/Scheduling"
depends on NET_SCHED
config NET_SCH_CBQ
tristate "Class Based Queueing (CBQ)"
depends on NET_SCHED
---help---
Say Y here if you want to use the Class-Based Queueing (CBQ) packet
scheduling algorithm. This algorithm classifies the waiting packets
...
...
@@ -120,7 +119,6 @@ config NET_SCH_CBQ
config NET_SCH_HTB
tristate "Hierarchical Token Bucket (HTB)"
depends on NET_SCHED
---help---
Say Y here if you want to use the Hierarchical Token Buckets (HTB)
packet scheduling algorithm. See
...
...
@@ -135,7 +133,6 @@ config NET_SCH_HTB
config NET_SCH_HFSC
tristate "Hierarchical Fair Service Curve (HFSC)"
depends on NET_SCHED
---help---
Say Y here if you want to use the Hierarchical Fair Service Curve
(HFSC) packet scheduling algorithm.
...
...
@@ -145,7 +142,7 @@ config NET_SCH_HFSC
config NET_SCH_ATM
tristate "ATM Virtual Circuits (ATM)"
depends on
NET_SCHED &&
ATM
depends on ATM
---help---
Say Y here if you want to use the ATM pseudo-scheduler. This
provides a framework for invoking classifiers, which in turn
...
...
@@ -159,7 +156,6 @@ config NET_SCH_ATM
config NET_SCH_PRIO
tristate "Multi Band Priority Queueing (PRIO)"
depends on NET_SCHED
---help---
Say Y here if you want to use an n-band priority queue packet
scheduler.
...
...
@@ -169,7 +165,6 @@ config NET_SCH_PRIO
config NET_SCH_RED
tristate "Random Early Detection (RED)"
depends on NET_SCHED
---help---
Say Y here if you want to use the Random Early Detection (RED)
packet scheduling algorithm.
...
...
@@ -181,7 +176,6 @@ config NET_SCH_RED
config NET_SCH_SFQ
tristate "Stochastic Fairness Queueing (SFQ)"
depends on NET_SCHED
---help---
Say Y here if you want to use the Stochastic Fairness Queueing (SFQ)
packet scheduling algorithm .
...
...
@@ -193,7 +187,6 @@ config NET_SCH_SFQ
config NET_SCH_TEQL
tristate "True Link Equalizer (TEQL)"
depends on NET_SCHED
---help---
Say Y here if you want to use the True Link Equalizer (TLE) packet
scheduling algorithm. This queueing discipline allows the combination
...
...
@@ -206,7 +199,6 @@ config NET_SCH_TEQL
config NET_SCH_TBF
tristate "Token Bucket Filter (TBF)"
depends on NET_SCHED
---help---
Say Y here if you want to use the Token Bucket Filter (TBF) packet
scheduling algorithm.
...
...
@@ -218,7 +210,6 @@ config NET_SCH_TBF
config NET_SCH_GRED
tristate "Generic Random Early Detection (GRED)"
depends on NET_SCHED
---help---
Say Y here if you want to use the Generic Random Early Detection
(GRED) packet scheduling algorithm for some of your network devices
...
...
@@ -230,7 +221,6 @@ config NET_SCH_GRED
config NET_SCH_DSMARK
tristate "Differentiated Services marker (DSMARK)"
depends on NET_SCHED
---help---
Say Y if you want to schedule packets according to the
Differentiated Services architecture proposed in RFC 2475.
...
...
@@ -242,7 +232,6 @@ config NET_SCH_DSMARK
config NET_SCH_NETEM
tristate "Network emulator (NETEM)"
depends on NET_SCHED
---help---
Say Y if you want to emulate network delay, loss, and packet
re-ordering. This is often useful to simulate networks when
...
...
@@ -255,7 +244,6 @@ config NET_SCH_NETEM
config NET_SCH_INGRESS
tristate "Ingress Qdisc"
depends on NET_SCHED
---help---
Say Y here if you want to use classifiers for incoming packets.
If unsure, say Y.
...
...
@@ -264,14 +252,12 @@ config NET_SCH_INGRESS
module will be called sch_ingress.
comment "Classification"
depends on NET_SCHED
config NET_CLS
boolean
config NET_CLS_BASIC
tristate "Elementary classification (BASIC)"
depends NET_SCHED
select NET_CLS
---help---
Say Y here if you want to be able to classify packets using
...
...
@@ -282,7 +268,6 @@ config NET_CLS_BASIC
config NET_CLS_TCINDEX
tristate "Traffic-Control Index (TCINDEX)"
depends NET_SCHED
select NET_CLS
---help---
Say Y here if you want to be able to classify packets based on
...
...
@@ -294,7 +279,6 @@ config NET_CLS_TCINDEX
config NET_CLS_ROUTE4
tristate "Routing decision (ROUTE)"
depends NET_SCHED
select NET_CLS_ROUTE
select NET_CLS
---help---
...
...
@@ -306,11 +290,9 @@ config NET_CLS_ROUTE4
config NET_CLS_ROUTE
bool
default n
config NET_CLS_FW
tristate "Netfilter mark (FW)"
depends NET_SCHED
select NET_CLS
---help---
If you say Y here, you will be able to classify packets
...
...
@@ -321,7 +303,6 @@ config NET_CLS_FW
config NET_CLS_U32
tristate "Universal 32bit comparisons w/ hashing (U32)"
depends NET_SCHED
select NET_CLS
---help---
Say Y here to be able to classify packetes using a universal
...
...
@@ -345,7 +326,6 @@ config CLS_U32_MARK
config NET_CLS_RSVP
tristate "IPv4 Resource Reservation Protocol (RSVP)"
depends on NET_SCHED
select NET_CLS
select NET_ESTIMATOR
---help---
...
...
@@ -361,7 +341,6 @@ config NET_CLS_RSVP
config NET_CLS_RSVP6
tristate "IPv6 Resource Reservation Protocol (RSVP6)"
depends on NET_SCHED
select NET_CLS
select NET_ESTIMATOR
---help---
...
...
@@ -377,7 +356,6 @@ config NET_CLS_RSVP6
config NET_EMATCH
bool "Extended Matches"
depends NET_SCHED
select NET_CLS
---help---
Say Y here if you want to use extended matches on top of classifiers
...
...
@@ -456,7 +434,7 @@ config NET_EMATCH_TEXT
config NET_CLS_ACT
bool "Actions"
depends on EXPERIMENTAL
&& NET_SCHED
depends on EXPERIMENTAL
select NET_ESTIMATOR
---help---
Say Y here if you want to use traffic control actions. Actions
...
...
@@ -539,7 +517,7 @@ config NET_ACT_SIMP
config NET_CLS_POLICE
bool "Traffic Policing (obsolete)"
depends on NET_
SCHED && NET_
CLS_ACT!=y
depends on NET_CLS_ACT!=y
select NET_ESTIMATOR
---help---
Say Y here if you want to do traffic policing, i.e. strict
...
...
@@ -549,7 +527,7 @@ config NET_CLS_POLICE
config NET_CLS_IND
bool "Incoming device classification"
depends on NET_
SCHED && (NET_CLS_U32 || NET_CLS_FW)
depends on NET_
CLS_U32 || NET_CLS_FW
---help---
Say Y here to extend the u32 and fw classifier to support
classification based on the incoming device. This option is
...
...
@@ -557,11 +535,12 @@ config NET_CLS_IND
config NET_ESTIMATOR
bool "Rate estimator"
depends on NET_SCHED
---help---
Say Y here to allow using rate estimators to estimate the current
rate-of-flow for network devices, queues, etc. This module is
automaticaly selected if needed but can be selected manually for
statstical purposes.
endif # NET_SCHED
endmenu
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录