Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
1b4c8af8
cloud-kernel
项目概览
openanolis
/
cloud-kernel
11 个月 前同步成功
通知
150
Star
36
Fork
7
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
10
列表
看板
标记
里程碑
合并请求
2
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
10
Issue
10
列表
看板
标记
里程碑
合并请求
2
合并请求
2
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1b4c8af8
编写于
8月 01, 2011
作者:
D
David S. Miller
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net
上级
3da3f872
384b90ab
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
23 addition
and
7 deletion
+23
-7
MAINTAINERS
MAINTAINERS
+1
-2
drivers/connector/cn_proc.c
drivers/connector/cn_proc.c
+6
-2
drivers/net/r8169.c
drivers/net/r8169.c
+1
-0
drivers/net/sis190.c
drivers/net/sis190.c
+11
-1
net/netfilter/ipvs/ip_vs_ctl.c
net/netfilter/ipvs/ip_vs_ctl.c
+1
-0
net/sunrpc/xprt.c
net/sunrpc/xprt.c
+1
-0
net/xfrm/xfrm_algo.c
net/xfrm/xfrm_algo.c
+2
-2
未找到文件。
MAINTAINERS
浏览文件 @
1b4c8af8
...
...
@@ -2643,9 +2643,8 @@ S: Maintained
F: arch/x86/math-emu/
FRAME RELAY DLCI/FRAD (Sangoma drivers too)
M: Mike McLagan <mike.mclagan@linux.org>
L: netdev@vger.kernel.org
S:
Maintained
S:
Orphan
F: drivers/net/wan/dlci.c
F: drivers/net/wan/sdla.c
...
...
drivers/connector/cn_proc.c
浏览文件 @
1b4c8af8
...
...
@@ -57,6 +57,7 @@ void proc_fork_connector(struct task_struct *task)
struct
proc_event
*
ev
;
__u8
buffer
[
CN_PROC_MSG_SIZE
];
struct
timespec
ts
;
struct
task_struct
*
parent
;
if
(
atomic_read
(
&
proc_event_num_listeners
)
<
1
)
return
;
...
...
@@ -67,8 +68,11 @@ void proc_fork_connector(struct task_struct *task)
ktime_get_ts
(
&
ts
);
/* get high res monotonic timestamp */
put_unaligned
(
timespec_to_ns
(
&
ts
),
(
__u64
*
)
&
ev
->
timestamp_ns
);
ev
->
what
=
PROC_EVENT_FORK
;
ev
->
event_data
.
fork
.
parent_pid
=
task
->
real_parent
->
pid
;
ev
->
event_data
.
fork
.
parent_tgid
=
task
->
real_parent
->
tgid
;
rcu_read_lock
();
parent
=
rcu_dereference
(
task
->
real_parent
);
ev
->
event_data
.
fork
.
parent_pid
=
parent
->
pid
;
ev
->
event_data
.
fork
.
parent_tgid
=
parent
->
tgid
;
rcu_read_unlock
();
ev
->
event_data
.
fork
.
child_pid
=
task
->
pid
;
ev
->
event_data
.
fork
.
child_tgid
=
task
->
tgid
;
...
...
drivers/net/r8169.c
浏览文件 @
1b4c8af8
...
...
@@ -239,6 +239,7 @@ static DEFINE_PCI_DEVICE_TABLE(rtl8169_pci_tbl) = {
{
PCI_DEVICE
(
PCI_VENDOR_ID_REALTEK
,
0x8168
),
0
,
0
,
RTL_CFG_1
},
{
PCI_DEVICE
(
PCI_VENDOR_ID_REALTEK
,
0x8169
),
0
,
0
,
RTL_CFG_0
},
{
PCI_DEVICE
(
PCI_VENDOR_ID_DLINK
,
0x4300
),
0
,
0
,
RTL_CFG_0
},
{
PCI_DEVICE
(
PCI_VENDOR_ID_DLINK
,
0x4302
),
0
,
0
,
RTL_CFG_0
},
{
PCI_DEVICE
(
PCI_VENDOR_ID_AT
,
0xc107
),
0
,
0
,
RTL_CFG_0
},
{
PCI_DEVICE
(
0x16ec
,
0x0116
),
0
,
0
,
RTL_CFG_0
},
{
PCI_VENDOR_ID_LINKSYS
,
0x1032
,
...
...
drivers/net/sis190.c
浏览文件 @
1b4c8af8
...
...
@@ -1825,6 +1825,16 @@ static int sis190_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
generic_mii_ioctl
(
&
tp
->
mii_if
,
if_mii
(
ifr
),
cmd
,
NULL
);
}
static
int
sis190_mac_addr
(
struct
net_device
*
dev
,
void
*
p
)
{
int
rc
;
rc
=
eth_mac_addr
(
dev
,
p
);
if
(
!
rc
)
sis190_init_rxfilter
(
dev
);
return
rc
;
}
static
const
struct
net_device_ops
sis190_netdev_ops
=
{
.
ndo_open
=
sis190_open
,
.
ndo_stop
=
sis190_close
,
...
...
@@ -1833,7 +1843,7 @@ static const struct net_device_ops sis190_netdev_ops = {
.
ndo_tx_timeout
=
sis190_tx_timeout
,
.
ndo_set_multicast_list
=
sis190_set_rx_mode
,
.
ndo_change_mtu
=
eth_change_mtu
,
.
ndo_set_mac_address
=
eth
_mac_addr
,
.
ndo_set_mac_address
=
sis190
_mac_addr
,
.
ndo_validate_addr
=
eth_validate_addr
,
#ifdef CONFIG_NET_POLL_CONTROLLER
.
ndo_poll_controller
=
sis190_netpoll
,
...
...
net/netfilter/ipvs/ip_vs_ctl.c
浏览文件 @
1b4c8af8
...
...
@@ -3771,6 +3771,7 @@ int __init ip_vs_control_init(void)
void
ip_vs_control_cleanup
(
void
)
{
EnterFunction
(
2
);
unregister_netdevice_notifier
(
&
ip_vs_dst_notifier
);
ip_vs_genl_unregister
();
nf_unregister_sockopt
(
&
ip_vs_sockopts
);
LeaveFunction
(
2
);
...
...
net/sunrpc/xprt.c
浏览文件 @
1b4c8af8
...
...
@@ -187,6 +187,7 @@ EXPORT_SYMBOL_GPL(xprt_load_transport);
/**
* xprt_reserve_xprt - serialize write access to transports
* @task: task that is requesting access to the transport
* @xprt: pointer to the target transport
*
* This prevents mixing the payload of separate requests, and prevents
* transport connects from colliding with writes. No congestion control
...
...
net/xfrm/xfrm_algo.c
浏览文件 @
1b4c8af8
...
...
@@ -462,8 +462,8 @@ static struct xfrm_algo_desc ealg_list[] = {
.
desc
=
{
.
sadb_alg_id
=
SADB_X_EALG_AESCTR
,
.
sadb_alg_ivlen
=
8
,
.
sadb_alg_minbits
=
1
28
,
.
sadb_alg_maxbits
=
2
56
.
sadb_alg_minbits
=
1
60
,
.
sadb_alg_maxbits
=
2
88
}
},
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录