Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
ed22e2f6
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,发现更多精彩内容 >>
提交
ed22e2f6
编写于
7月 03, 2017
作者:
D
David S. Miller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
s2io: Remove UFO support.
Signed-off-by:
N
David S. Miller
<
davem@davemloft.net
>
上级
6093ec2d
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
0 addition
and
45 deletion
+0
-45
drivers/net/ethernet/neterion/s2io.c
drivers/net/ethernet/neterion/s2io.c
+0
-45
未找到文件。
drivers/net/ethernet/neterion/s2io.c
浏览文件 @
ed22e2f6
...
...
@@ -42,8 +42,6 @@
* aggregated as a single large packet
* napi: This parameter used to enable/disable NAPI (polling Rx)
* Possible values '1' for enable and '0' for disable. Default is '1'
* ufo: This parameter used to enable/disable UDP Fragmentation Offload(UFO)
* Possible values '1' for enable and '0' for disable. Default is '0'
* vlan_tag_strip: This can be used to enable or disable vlan stripping.
* Possible values '1' for enable , '0' for disable.
* Default is '2' - which means disable in promisc mode
...
...
@@ -453,7 +451,6 @@ S2IO_PARM_INT(lro_max_pkts, 0xFFFF);
S2IO_PARM_INT
(
indicate_max_pkts
,
0
);
S2IO_PARM_INT
(
napi
,
1
);
S2IO_PARM_INT
(
ufo
,
0
);
S2IO_PARM_INT
(
vlan_tag_strip
,
NO_STRIP_IN_PROMISC
);
static
unsigned
int
tx_fifo_len
[
MAX_TX_FIFOS
]
=
...
...
@@ -4128,32 +4125,6 @@ static netdev_tx_t s2io_xmit(struct sk_buff *skb, struct net_device *dev)
}
frg_len
=
skb_headlen
(
skb
);
if
(
offload_type
==
SKB_GSO_UDP
)
{
int
ufo_size
;
ufo_size
=
s2io_udp_mss
(
skb
);
ufo_size
&=
~
7
;
txdp
->
Control_1
|=
TXD_UFO_EN
;
txdp
->
Control_1
|=
TXD_UFO_MSS
(
ufo_size
);
txdp
->
Control_1
|=
TXD_BUFFER0_SIZE
(
8
);
#ifdef __BIG_ENDIAN
/* both variants do cpu_to_be64(be32_to_cpu(...)) */
fifo
->
ufo_in_band_v
[
put_off
]
=
(
__force
u64
)
skb_shinfo
(
skb
)
->
ip6_frag_id
;
#else
fifo
->
ufo_in_band_v
[
put_off
]
=
(
__force
u64
)
skb_shinfo
(
skb
)
->
ip6_frag_id
<<
32
;
#endif
txdp
->
Host_Control
=
(
unsigned
long
)
fifo
->
ufo_in_band_v
;
txdp
->
Buffer_Pointer
=
pci_map_single
(
sp
->
pdev
,
fifo
->
ufo_in_band_v
,
sizeof
(
u64
),
PCI_DMA_TODEVICE
);
if
(
pci_dma_mapping_error
(
sp
->
pdev
,
txdp
->
Buffer_Pointer
))
goto
pci_map_failed
;
txdp
++
;
}
txdp
->
Buffer_Pointer
=
pci_map_single
(
sp
->
pdev
,
skb
->
data
,
frg_len
,
PCI_DMA_TODEVICE
);
if
(
pci_dma_mapping_error
(
sp
->
pdev
,
txdp
->
Buffer_Pointer
))
...
...
@@ -4161,8 +4132,6 @@ static netdev_tx_t s2io_xmit(struct sk_buff *skb, struct net_device *dev)
txdp
->
Host_Control
=
(
unsigned
long
)
skb
;
txdp
->
Control_1
|=
TXD_BUFFER0_SIZE
(
frg_len
);
if
(
offload_type
==
SKB_GSO_UDP
)
txdp
->
Control_1
|=
TXD_UFO_EN
;
frg_cnt
=
skb_shinfo
(
skb
)
->
nr_frags
;
/* For fragmented SKB. */
...
...
@@ -4177,14 +4146,9 @@ static netdev_tx_t s2io_xmit(struct sk_buff *skb, struct net_device *dev)
skb_frag_size
(
frag
),
DMA_TO_DEVICE
);
txdp
->
Control_1
=
TXD_BUFFER0_SIZE
(
skb_frag_size
(
frag
));
if
(
offload_type
==
SKB_GSO_UDP
)
txdp
->
Control_1
|=
TXD_UFO_EN
;
}
txdp
->
Control_1
|=
TXD_GATHER_CODE_LAST
;
if
(
offload_type
==
SKB_GSO_UDP
)
frg_cnt
++
;
/* as Txd0 was used for inband header */
tx_fifo
=
mac_control
->
tx_FIFO_start
[
queue
];
val64
=
fifo
->
list_info
[
put_off
].
list_phy_addr
;
writeq
(
val64
,
&
tx_fifo
->
TxDL_Pointer
);
...
...
@@ -7910,11 +7874,6 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
NETIF_F_RXCSUM
|
NETIF_F_LRO
;
dev
->
features
|=
dev
->
hw_features
|
NETIF_F_HW_VLAN_CTAG_TX
|
NETIF_F_HW_VLAN_CTAG_RX
;
if
(
sp
->
device_type
&
XFRAME_II_DEVICE
)
{
dev
->
hw_features
|=
NETIF_F_UFO
;
if
(
ufo
)
dev
->
features
|=
NETIF_F_UFO
;
}
if
(
sp
->
high_dma_flag
==
true
)
dev
->
features
|=
NETIF_F_HIGHDMA
;
dev
->
watchdog_timeo
=
WATCH_DOG_TIMEOUT
;
...
...
@@ -8147,10 +8106,6 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
DBG_PRINT
(
ERR_DBG
,
"%s: Large receive offload enabled
\n
"
,
dev
->
name
);
if
(
ufo
)
DBG_PRINT
(
ERR_DBG
,
"%s: UDP Fragmentation Offload(UFO) enabled
\n
"
,
dev
->
name
);
/* Initialize device name */
snprintf
(
sp
->
name
,
sizeof
(
sp
->
name
),
"%s Neterion %s"
,
dev
->
name
,
sp
->
product_name
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录