Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
a2224ad3
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,发现更多精彩内容 >>
提交
a2224ad3
编写于
11月 14, 2008
作者:
D
David S. Miller
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
上级
5421ae01
3e44017b
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
15 addition
and
29 deletion
+15
-29
drivers/net/atl1e/atl1e_hw.c
drivers/net/atl1e/atl1e_hw.c
+0
-4
drivers/net/atlx/atl1.c
drivers/net/atlx/atl1.c
+3
-14
drivers/net/gianfar.c
drivers/net/gianfar.c
+8
-7
drivers/net/phy/mdio_bus.c
drivers/net/phy/mdio_bus.c
+1
-1
drivers/net/ucc_geth_ethtool.c
drivers/net/ucc_geth_ethtool.c
+3
-3
未找到文件。
drivers/net/atl1e/atl1e_hw.c
浏览文件 @
a2224ad3
...
...
@@ -163,9 +163,6 @@ int atl1e_read_mac_addr(struct atl1e_hw *hw)
* atl1e_hash_mc_addr
* purpose
* set hash value for a multicast address
* hash calcu processing :
* 1. calcu 32bit CRC for multicast address
* 2. reverse crc with MSB to LSB
*/
u32
atl1e_hash_mc_addr
(
struct
atl1e_hw
*
hw
,
u8
*
mc_addr
)
{
...
...
@@ -174,7 +171,6 @@ u32 atl1e_hash_mc_addr(struct atl1e_hw *hw, u8 *mc_addr)
int
i
;
crc32
=
ether_crc_le
(
6
,
mc_addr
);
crc32
=
~
crc32
;
for
(
i
=
0
;
i
<
32
;
i
++
)
value
|=
(((
crc32
>>
i
)
&
1
)
<<
(
31
-
i
));
...
...
drivers/net/atlx/atl1.c
浏览文件 @
a2224ad3
...
...
@@ -3404,14 +3404,8 @@ static void atl1_get_wol(struct net_device *netdev,
{
struct
atl1_adapter
*
adapter
=
netdev_priv
(
netdev
);
wol
->
supported
=
WAKE_
UCAST
|
WAKE_MCAST
|
WAKE_BCAST
|
WAKE_
MAGIC
;
wol
->
supported
=
WAKE_MAGIC
;
wol
->
wolopts
=
0
;
if
(
adapter
->
wol
&
ATLX_WUFC_EX
)
wol
->
wolopts
|=
WAKE_UCAST
;
if
(
adapter
->
wol
&
ATLX_WUFC_MC
)
wol
->
wolopts
|=
WAKE_MCAST
;
if
(
adapter
->
wol
&
ATLX_WUFC_BC
)
wol
->
wolopts
|=
WAKE_BCAST
;
if
(
adapter
->
wol
&
ATLX_WUFC_MAG
)
wol
->
wolopts
|=
WAKE_MAGIC
;
return
;
...
...
@@ -3422,15 +3416,10 @@ static int atl1_set_wol(struct net_device *netdev,
{
struct
atl1_adapter
*
adapter
=
netdev_priv
(
netdev
);
if
(
wol
->
wolopts
&
(
WAKE_PHY
|
WAKE_ARP
|
WAKE_MAGICSECURE
))
if
(
wol
->
wolopts
&
(
WAKE_PHY
|
WAKE_UCAST
|
WAKE_MCAST
|
WAKE_BCAST
|
WAKE_ARP
|
WAKE_MAGICSECURE
))
return
-
EOPNOTSUPP
;
adapter
->
wol
=
0
;
if
(
wol
->
wolopts
&
WAKE_UCAST
)
adapter
->
wol
|=
ATLX_WUFC_EX
;
if
(
wol
->
wolopts
&
WAKE_MCAST
)
adapter
->
wol
|=
ATLX_WUFC_MC
;
if
(
wol
->
wolopts
&
WAKE_BCAST
)
adapter
->
wol
|=
ATLX_WUFC_BC
;
if
(
wol
->
wolopts
&
WAKE_MAGIC
)
adapter
->
wol
|=
ATLX_WUFC_MAG
;
return
0
;
...
...
drivers/net/gianfar.c
浏览文件 @
a2224ad3
...
...
@@ -1407,6 +1407,10 @@ static int gfar_clean_tx_ring(struct net_device *dev)
if
(
bdp
->
status
&
TXBD_DEF
)
dev
->
stats
.
collisions
++
;
/* Unmap the DMA memory */
dma_unmap_single
(
&
priv
->
dev
->
dev
,
bdp
->
bufPtr
,
bdp
->
length
,
DMA_TO_DEVICE
);
/* Free the sk buffer associated with this TxBD */
dev_kfree_skb_irq
(
priv
->
tx_skbuff
[
priv
->
skb_dirtytx
]);
...
...
@@ -1666,6 +1670,9 @@ int gfar_clean_rx_ring(struct net_device *dev, int rx_work_limit)
skb
=
priv
->
rx_skbuff
[
priv
->
skb_currx
];
dma_unmap_single
(
&
priv
->
dev
->
dev
,
bdp
->
bufPtr
,
priv
->
rx_buffer_size
,
DMA_FROM_DEVICE
);
/* We drop the frame if we failed to allocate a new buffer */
if
(
unlikely
(
!
newskb
||
!
(
bdp
->
status
&
RXBD_LAST
)
||
bdp
->
status
&
RXBD_ERR
))
{
...
...
@@ -1674,14 +1681,8 @@ int gfar_clean_rx_ring(struct net_device *dev, int rx_work_limit)
if
(
unlikely
(
!
newskb
))
newskb
=
skb
;
if
(
skb
)
{
dma_unmap_single
(
&
priv
->
dev
->
dev
,
bdp
->
bufPtr
,
priv
->
rx_buffer_size
,
DMA_FROM_DEVICE
);
if
(
skb
)
dev_kfree_skb_any
(
skb
);
}
}
else
{
/* Increment the number of packets */
dev
->
stats
.
rx_packets
++
;
...
...
drivers/net/phy/mdio_bus.c
浏览文件 @
a2224ad3
...
...
@@ -136,7 +136,7 @@ void mdiobus_unregister(struct mii_bus *bus)
BUG_ON
(
bus
->
state
!=
MDIOBUS_REGISTERED
);
bus
->
state
=
MDIOBUS_UNREGISTERED
;
device_
unregister
(
&
bus
->
dev
);
device_
del
(
&
bus
->
dev
);
for
(
i
=
0
;
i
<
PHY_MAX_ADDR
;
i
++
)
{
if
(
bus
->
phy_map
[
i
])
device_unregister
(
&
bus
->
phy_map
[
i
]
->
dev
);
...
...
drivers/net/ucc_geth_ethtool.c
浏览文件 @
a2224ad3
...
...
@@ -323,17 +323,17 @@ static void uec_get_ethtool_stats(struct net_device *netdev,
if
(
stats_mode
&
UCC_GETH_STATISTICS_GATHERING_MODE_HARDWARE
)
{
base
=
(
u32
__iomem
*
)
&
ugeth
->
ug_regs
->
tx64
;
for
(
i
=
0
;
i
<
UEC_HW_STATS_LEN
;
i
++
)
data
[
j
++
]
=
(
u64
)
in_be32
(
&
base
[
i
]);
data
[
j
++
]
=
in_be32
(
&
base
[
i
]);
}
if
(
stats_mode
&
UCC_GETH_STATISTICS_GATHERING_MODE_FIRMWARE_TX
)
{
base
=
(
u32
__iomem
*
)
ugeth
->
p_tx_fw_statistics_pram
;
for
(
i
=
0
;
i
<
UEC_TX_FW_STATS_LEN
;
i
++
)
data
[
j
++
]
=
(
u64
)
in_be32
(
&
base
[
i
])
;
data
[
j
++
]
=
base
?
in_be32
(
&
base
[
i
])
:
0
;
}
if
(
stats_mode
&
UCC_GETH_STATISTICS_GATHERING_MODE_FIRMWARE_RX
)
{
base
=
(
u32
__iomem
*
)
ugeth
->
p_rx_fw_statistics_pram
;
for
(
i
=
0
;
i
<
UEC_RX_FW_STATS_LEN
;
i
++
)
data
[
j
++
]
=
(
u64
)
in_be32
(
&
base
[
i
])
;
data
[
j
++
]
=
base
?
in_be32
(
&
base
[
i
])
:
0
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录