Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
e0048402
cloud-kernel
项目概览
openanolis
/
cloud-kernel
大约 1 年 前同步成功
通知
153
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,发现更多精彩内容 >>
提交
e0048402
编写于
12月 02, 2009
作者:
D
David S. Miller
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
上级
3248e168
1f5865e7
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
3 addition
and
38 deletion
+3
-38
Documentation/networking/ip-sysctl.txt
Documentation/networking/ip-sysctl.txt
+2
-2
drivers/net/atl1e/atl1e_main.c
drivers/net/atl1e/atl1e_main.c
+0
-36
drivers/net/bnx2.c
drivers/net/bnx2.c
+1
-0
未找到文件。
Documentation/networking/ip-sysctl.txt
浏览文件 @
e0048402
...
@@ -738,8 +738,8 @@ rp_filter - INTEGER
...
@@ -738,8 +738,8 @@ rp_filter - INTEGER
to prevent IP spoofing from DDos attacks. If using asymmetric routing
to prevent IP spoofing from DDos attacks. If using asymmetric routing
or other complicated routing, then loose mode is recommended.
or other complicated routing, then loose mode is recommended.
conf/all/rp_filter must also be set to non-zero to do source validation
The max value from conf/{all,interface}/rp_filter is used
on the interface
when doing source validation on the {interface}.
Default value is 0. Note that some distributions enable it
Default value is 0. Note that some distributions enable it
in startup scripts.
in startup scripts.
...
...
drivers/net/atl1e/atl1e_main.c
浏览文件 @
e0048402
...
@@ -1664,41 +1664,6 @@ static int atl1e_tso_csum(struct atl1e_adapter *adapter,
...
@@ -1664,41 +1664,6 @@ static int atl1e_tso_csum(struct atl1e_adapter *adapter,
}
}
return
0
;
return
0
;
}
}
if
(
offload_type
&
SKB_GSO_TCPV6
)
{
real_len
=
(((
unsigned
char
*
)
ipv6_hdr
(
skb
)
-
skb
->
data
)
+
ntohs
(
ipv6_hdr
(
skb
)
->
payload_len
));
if
(
real_len
<
skb
->
len
)
pskb_trim
(
skb
,
real_len
);
/* check payload == 0 byte ? */
hdr_len
=
(
skb_transport_offset
(
skb
)
+
tcp_hdrlen
(
skb
));
if
(
unlikely
(
skb
->
len
==
hdr_len
))
{
/* only xsum need */
dev_warn
(
&
pdev
->
dev
,
"IPV6 tso with zero data??
\n
"
);
goto
check_sum
;
}
else
{
tcp_hdr
(
skb
)
->
check
=
~
csum_ipv6_magic
(
&
ipv6_hdr
(
skb
)
->
saddr
,
&
ipv6_hdr
(
skb
)
->
daddr
,
0
,
IPPROTO_TCP
,
0
);
tpd
->
word3
|=
1
<<
TPD_IP_VERSION_SHIFT
;
hdr_len
>>=
1
;
tpd
->
word3
|=
(
hdr_len
&
TPD_V6_IPHLLO_MASK
)
<<
TPD_V6_IPHLLO_SHIFT
;
tpd
->
word3
|=
((
hdr_len
>>
3
)
&
TPD_V6_IPHLHI_MASK
)
<<
TPD_V6_IPHLHI_SHIFT
;
tpd
->
word3
|=
(
tcp_hdrlen
(
skb
)
>>
2
&
TPD_TCPHDRLEN_MASK
)
<<
TPD_TCPHDRLEN_SHIFT
;
tpd
->
word3
|=
((
skb_shinfo
(
skb
)
->
gso_size
)
&
TPD_MSS_MASK
)
<<
TPD_MSS_SHIFT
;
tpd
->
word3
|=
1
<<
TPD_SEGMENT_EN_SHIFT
;
}
}
return
0
;
}
}
check_sum:
check_sum:
...
@@ -2287,7 +2252,6 @@ static int atl1e_init_netdev(struct net_device *netdev, struct pci_dev *pdev)
...
@@ -2287,7 +2252,6 @@ static int atl1e_init_netdev(struct net_device *netdev, struct pci_dev *pdev)
NETIF_F_HW_VLAN_TX
|
NETIF_F_HW_VLAN_RX
;
NETIF_F_HW_VLAN_TX
|
NETIF_F_HW_VLAN_RX
;
netdev
->
features
|=
NETIF_F_LLTX
;
netdev
->
features
|=
NETIF_F_LLTX
;
netdev
->
features
|=
NETIF_F_TSO
;
netdev
->
features
|=
NETIF_F_TSO
;
netdev
->
features
|=
NETIF_F_TSO6
;
return
0
;
return
0
;
}
}
...
...
drivers/net/bnx2.c
浏览文件 @
e0048402
...
@@ -8316,6 +8316,7 @@ static pci_ers_result_t bnx2_io_slot_reset(struct pci_dev *pdev)
...
@@ -8316,6 +8316,7 @@ static pci_ers_result_t bnx2_io_slot_reset(struct pci_dev *pdev)
}
}
pci_set_master
(
pdev
);
pci_set_master
(
pdev
);
pci_restore_state
(
pdev
);
pci_restore_state
(
pdev
);
pci_save_state
(
pdev
);
if
(
netif_running
(
dev
))
{
if
(
netif_running
(
dev
))
{
bnx2_set_power_state
(
bp
,
PCI_D0
);
bnx2_set_power_state
(
bp
,
PCI_D0
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录