Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
4790654c
K
Kernel
项目概览
openeuler
/
Kernel
1 年多 前同步成功
通知
8
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看板
提交
4790654c
编写于
11月 23, 2007
作者:
J
Jeff Garzik
提交者:
David S. Miller
1月 28, 2008
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[netdrvr] netxen: checkpatch fixes (98% trim trailing whitespace)
Signed-off-by:
N
Jeff Garzik
<
jgarzik@redhat.com
>
上级
ba734f34
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
79 addition
and
79 deletion
+79
-79
drivers/net/netxen/netxen_nic.h
drivers/net/netxen/netxen_nic.h
+8
-8
drivers/net/netxen/netxen_nic_ethtool.c
drivers/net/netxen/netxen_nic_ethtool.c
+13
-13
drivers/net/netxen/netxen_nic_hw.c
drivers/net/netxen/netxen_nic_hw.c
+6
-6
drivers/net/netxen/netxen_nic_hw.h
drivers/net/netxen/netxen_nic_hw.h
+5
-5
drivers/net/netxen/netxen_nic_init.c
drivers/net/netxen/netxen_nic_init.c
+12
-12
drivers/net/netxen/netxen_nic_isr.c
drivers/net/netxen/netxen_nic_isr.c
+4
-4
drivers/net/netxen/netxen_nic_main.c
drivers/net/netxen/netxen_nic_main.c
+10
-10
drivers/net/netxen/netxen_nic_niu.c
drivers/net/netxen/netxen_nic_niu.c
+17
-17
drivers/net/netxen/netxen_nic_phan_reg.h
drivers/net/netxen/netxen_nic_phan_reg.h
+4
-4
未找到文件。
drivers/net/netxen/netxen_nic.h
浏览文件 @
4790654c
...
...
@@ -113,8 +113,8 @@
#define FLUSH_SCHEDULED_WORK() flush_workqueue(netxen_workq)
extern
struct
workqueue_struct
*
netxen_workq
;
/*
* normalize a 64MB crb address to 32MB PCI window
/*
* normalize a 64MB crb address to 32MB PCI window
* To use NETXEN_CRB_NORMALIZE, window _must_ be set to 1
*/
#define NETXEN_CRB_NORMAL(reg) \
...
...
@@ -736,11 +736,11 @@ struct netxen_skb_frag {
(config_word) &= ~__tmask; \
(config_word) |= (((__tvalue) << (start)) & __tmask); \
}
#define _netxen_clear_bits(config_word, start, bits) {\
unsigned long long __tmask = (((1ULL << (bits)) - 1) << (start)); \
(config_word) &= ~__tmask; \
}
}
/* Following defines are for the state of the buffers */
#define NETXEN_BUFFER_FREE 0
...
...
@@ -879,7 +879,7 @@ struct netxen_dummy_dma {
struct
netxen_adapter
{
struct
netxen_hardware_context
ahw
;
struct
netxen_adapter
*
master
;
struct
net_device
*
netdev
;
struct
pci_dev
*
pdev
;
...
...
@@ -916,7 +916,7 @@ struct netxen_adapter {
u32
temp
;
struct
netxen_adapter_stats
stats
;
u16
portno
;
u16
link_speed
;
u16
link_duplex
;
...
...
@@ -1050,9 +1050,9 @@ int netxen_phantom_init(struct netxen_adapter *adapter, int pegtune_val);
int
netxen_load_firmware
(
struct
netxen_adapter
*
adapter
);
int
netxen_pinit_from_rom
(
struct
netxen_adapter
*
adapter
,
int
verbose
);
int
netxen_rom_fast_read
(
struct
netxen_adapter
*
adapter
,
int
addr
,
int
*
valp
);
int
netxen_rom_fast_read_words
(
struct
netxen_adapter
*
adapter
,
int
addr
,
int
netxen_rom_fast_read_words
(
struct
netxen_adapter
*
adapter
,
int
addr
,
u8
*
bytes
,
size_t
size
);
int
netxen_rom_fast_write_words
(
struct
netxen_adapter
*
adapter
,
int
addr
,
int
netxen_rom_fast_write_words
(
struct
netxen_adapter
*
adapter
,
int
addr
,
u8
*
bytes
,
size_t
size
);
int
netxen_flash_unlock
(
struct
netxen_adapter
*
adapter
);
int
netxen_backup_crbinit
(
struct
netxen_adapter
*
adapter
);
...
...
drivers/net/netxen/netxen_nic_ethtool.c
浏览文件 @
4790654c
...
...
@@ -423,11 +423,11 @@ netxen_nic_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
if
(
eeprom
->
len
==
0
)
return
-
EINVAL
;
eeprom
->
magic
=
(
adapter
->
pdev
)
->
vendor
|
eeprom
->
magic
=
(
adapter
->
pdev
)
->
vendor
|
((
adapter
->
pdev
)
->
device
<<
16
);
offset
=
eeprom
->
offset
;
ret
=
netxen_rom_fast_read_words
(
adapter
,
offset
,
bytes
,
ret
=
netxen_rom_fast_read_words
(
adapter
,
offset
,
bytes
,
eeprom
->
len
);
if
(
ret
<
0
)
return
ret
;
...
...
@@ -453,16 +453,16 @@ netxen_nic_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
netxen_nic_driver_name
);
return
ret
;
}
printk
(
KERN_INFO
"%s: flash unlocked.
\n
"
,
printk
(
KERN_INFO
"%s: flash unlocked.
\n
"
,
netxen_nic_driver_name
);
last_schedule_time
=
jiffies
;
ret
=
netxen_flash_erase_secondary
(
adapter
);
if
(
ret
!=
FLASH_SUCCESS
)
{
printk
(
KERN_ERR
"%s: Flash erase failed.
\n
"
,
printk
(
KERN_ERR
"%s: Flash erase failed.
\n
"
,
netxen_nic_driver_name
);
return
ret
;
}
printk
(
KERN_INFO
"%s: secondary flash erased successfully.
\n
"
,
printk
(
KERN_INFO
"%s: secondary flash erased successfully.
\n
"
,
netxen_nic_driver_name
);
flash_start
=
1
;
return
0
;
...
...
@@ -471,7 +471,7 @@ netxen_nic_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
if
(
offset
==
NETXEN_BOOTLD_START
)
{
ret
=
netxen_flash_erase_primary
(
adapter
);
if
(
ret
!=
FLASH_SUCCESS
)
{
printk
(
KERN_ERR
"%s: Flash erase failed.
\n
"
,
printk
(
KERN_ERR
"%s: Flash erase failed.
\n
"
,
netxen_nic_driver_name
);
return
ret
;
}
...
...
@@ -483,16 +483,16 @@ netxen_nic_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
if
(
ret
!=
FLASH_SUCCESS
)
return
ret
;
printk
(
KERN_INFO
"%s: primary flash erased successfully
\n
"
,
printk
(
KERN_INFO
"%s: primary flash erased successfully
\n
"
,
netxen_nic_driver_name
);
ret
=
netxen_backup_crbinit
(
adapter
);
if
(
ret
!=
FLASH_SUCCESS
)
{
printk
(
KERN_ERR
"%s: CRBinit backup failed.
\n
"
,
printk
(
KERN_ERR
"%s: CRBinit backup failed.
\n
"
,
netxen_nic_driver_name
);
return
ret
;
}
printk
(
KERN_INFO
"%s: CRBinit backup done.
\n
"
,
printk
(
KERN_INFO
"%s: CRBinit backup done.
\n
"
,
netxen_nic_driver_name
);
ready_to_flash
=
1
;
}
...
...
@@ -570,7 +570,7 @@ netxen_nic_get_pauseparam(struct net_device *dev,
else
pause
->
tx_pause
=
!
(
netxen_xg_get_xg1_mask
(
val
));
}
else
{
printk
(
KERN_ERR
"%s: Unknown board type: %x
\n
"
,
printk
(
KERN_ERR
"%s: Unknown board type: %x
\n
"
,
netxen_nic_driver_name
,
adapter
->
ahw
.
board_type
);
}
}
...
...
@@ -589,7 +589,7 @@ netxen_nic_set_pauseparam(struct net_device *dev,
/* set flow control */
netxen_nic_read_w0
(
adapter
,
NETXEN_NIU_GB_MAC_CONFIG_0
(
port
),
&
val
);
if
(
pause
->
rx_pause
)
netxen_gb_rx_flowctl
(
val
);
else
...
...
@@ -642,10 +642,10 @@ netxen_nic_set_pauseparam(struct net_device *dev,
else
netxen_xg_set_xg1_mask
(
val
);
}
netxen_nic_write_w0
(
adapter
,
NETXEN_NIU_XG_PAUSE_CTL
,
val
);
netxen_nic_write_w0
(
adapter
,
NETXEN_NIU_XG_PAUSE_CTL
,
val
);
}
else
{
printk
(
KERN_ERR
"%s: Unknown board type: %x
\n
"
,
netxen_nic_driver_name
,
netxen_nic_driver_name
,
adapter
->
ahw
.
board_type
);
}
return
0
;
...
...
drivers/net/netxen/netxen_nic_hw.c
浏览文件 @
4790654c
...
...
@@ -160,7 +160,7 @@ struct netxen_recv_crb recv_crb_registers[] = {
},
/* Jumbo frames */
{
/* crb_rcv_producer_offset: */
/* crb_rcv_producer_offset: */
NETXEN_NIC_REG
(
0x1f8
),
/* crb_rcv_consumer_offset: */
NETXEN_NIC_REG
(
0x1fc
),
...
...
@@ -209,7 +209,7 @@ struct netxen_recv_crb recv_crb_registers[] = {
},
/* Jumbo frames */
{
/* crb_rcv_producer_offset: */
/* crb_rcv_producer_offset: */
NETXEN_NIC_REG
(
0x23c
),
/* crb_rcv_consumer_offset: */
NETXEN_NIC_REG
(
0x240
),
...
...
@@ -888,7 +888,7 @@ void netxen_nic_read_w0(struct netxen_adapter *adapter, u32 index, u32 * value)
netxen_nic_pci_change_crbwindow
(
adapter
,
1
);
}
static
int
netxen_pci_set_window_warning_count
=
0
;
static
int
netxen_pci_set_window_warning_count
;
static
unsigned
long
netxen_nic_pci_set_window
(
struct
netxen_adapter
*
adapter
,
unsigned
long
long
addr
)
...
...
@@ -958,7 +958,7 @@ int
netxen_nic_erase_pxe(struct netxen_adapter *adapter)
{
if (netxen_rom_fast_write(adapter, NETXEN_PXE_START, 0) == -1) {
printk(KERN_ERR "%s: erase pxe failed\n",
printk(KERN_ERR "%s: erase pxe failed\n",
netxen_nic_driver_name);
return -1;
}
...
...
@@ -1039,9 +1039,9 @@ int netxen_nic_set_mtu_xgb(struct netxen_adapter *adapter, int new_mtu)
{
new_mtu
+=
NETXEN_NIU_HDRSIZE
+
NETXEN_NIU_TLRSIZE
;
if
(
physical_port
[
adapter
->
portnum
]
==
0
)
netxen_nic_write_w0
(
adapter
,
NETXEN_NIU_XGE_MAX_FRAME_SIZE
,
netxen_nic_write_w0
(
adapter
,
NETXEN_NIU_XGE_MAX_FRAME_SIZE
,
new_mtu
);
else
else
netxen_nic_write_w0
(
adapter
,
NETXEN_NIU_XG1_MAX_FRAME_SIZE
,
new_mtu
);
return
0
;
...
...
drivers/net/netxen/netxen_nic_hw.h
浏览文件 @
4790654c
...
...
@@ -235,7 +235,7 @@ typedef enum {
((config_word) |= 1 << 0)
#define netxen_xg_set_xg1_mask(config_word) \
((config_word) |= 1 << 3)
#define netxen_xg_get_xg0_mask(config_word) \
_netxen_crb_get_bit((config_word), 0)
#define netxen_xg_get_xg1_mask(config_word) \
...
...
@@ -273,7 +273,7 @@ typedef enum {
_netxen_crb_get_bit((config_word), 4)
#define netxen_gb_get_gb3_mask(config_word) \
_netxen_crb_get_bit((config_word), 6)
#define netxen_gb_unset_gb0_mask(config_word) \
((config_word) &= ~(1 << 0))
#define netxen_gb_unset_gb1_mask(config_word) \
...
...
@@ -437,7 +437,7 @@ typedef enum {
/*
* NIU GB Drop CRC Register
*
*
* Bit 0 : drop_gb0 => 1:drop pkts with bad CRCs, 0:pass them on
* Bit 1 : drop_gb1 => 1:drop pkts with bad CRCs, 0:pass them on
* Bit 2 : drop_gb2 => 1:drop pkts with bad CRCs, 0:pass them on
...
...
@@ -480,7 +480,7 @@ typedef enum {
/*
* MAC Control Register
*
*
* Bit 0-1 : id_pool0
* Bit 2 : enable_xtnd0
* Bit 4-5 : id_pool1
...
...
@@ -515,7 +515,7 @@ typedef enum {
((config) |= (((val) & 0x0f) << 28))
/* Set promiscuous mode for a GbE interface */
int
netxen_niu_set_promiscuous_mode
(
struct
netxen_adapter
*
adapter
,
int
netxen_niu_set_promiscuous_mode
(
struct
netxen_adapter
*
adapter
,
netxen_niu_prom_mode_t
mode
);
int
netxen_niu_xg_set_promiscuous_mode
(
struct
netxen_adapter
*
adapter
,
netxen_niu_prom_mode_t
mode
);
...
...
drivers/net/netxen/netxen_nic_init.c
浏览文件 @
4790654c
...
...
@@ -449,7 +449,7 @@ static int do_rom_fast_read_words(struct netxen_adapter *adapter, int addr,
}
int
netxen_rom_fast_read_words
(
struct
netxen_adapter
*
adapter
,
int
addr
,
netxen_rom_fast_read_words
(
struct
netxen_adapter
*
adapter
,
int
addr
,
u8
*
bytes
,
size_t
size
)
{
int
ret
;
...
...
@@ -490,7 +490,7 @@ int netxen_rom_fast_write(struct netxen_adapter *adapter, int addr, int data)
}
#endif /* 0 */
static
int
do_rom_fast_write_words
(
struct
netxen_adapter
*
adapter
,
static
int
do_rom_fast_write_words
(
struct
netxen_adapter
*
adapter
,
int
addr
,
u8
*
bytes
,
size_t
size
)
{
int
addridx
=
addr
;
...
...
@@ -505,7 +505,7 @@ static int do_rom_fast_write_words(struct netxen_adapter *adapter,
ret
=
do_rom_fast_write
(
adapter
,
addridx
,
data
);
if
(
ret
<
0
)
return
ret
;
while
(
1
)
{
int
data1
;
...
...
@@ -518,7 +518,7 @@ static int do_rom_fast_write_words(struct netxen_adapter *adapter,
if
(
timeout
++
>=
rom_write_timeout
)
{
if
(
last_attempt
++
<
4
)
{
ret
=
do_rom_fast_write
(
adapter
,
ret
=
do_rom_fast_write
(
adapter
,
addridx
,
data
);
if
(
ret
<
0
)
return
ret
;
...
...
@@ -538,7 +538,7 @@ static int do_rom_fast_write_words(struct netxen_adapter *adapter,
return
ret
;
}
int
netxen_rom_fast_write_words
(
struct
netxen_adapter
*
adapter
,
int
addr
,
int
netxen_rom_fast_write_words
(
struct
netxen_adapter
*
adapter
,
int
addr
,
u8
*
bytes
,
size_t
size
)
{
int
ret
=
0
;
...
...
@@ -562,7 +562,7 @@ static int netxen_rom_wrsr(struct netxen_adapter *adapter, int data)
return
ret
;
netxen_crb_writelit_adapter
(
adapter
,
NETXEN_ROMUSB_ROM_WDATA
,
data
);
netxen_crb_writelit_adapter
(
adapter
,
netxen_crb_writelit_adapter
(
adapter
,
NETXEN_ROMUSB_ROM_INSTR_OPCODE
,
0x1
);
ret
=
netxen_wait_rom_done
(
adapter
);
...
...
@@ -592,7 +592,7 @@ int netxen_backup_crbinit(struct netxen_adapter *adapter)
char
*
buffer
=
kmalloc
(
NETXEN_FLASH_SECTOR_SIZE
,
GFP_KERNEL
);
if
(
!
buffer
)
return
-
ENOMEM
;
return
-
ENOMEM
;
/* unlock sector 63 */
val
=
netxen_rom_rdsr
(
adapter
);
val
=
val
&
0xe3
;
...
...
@@ -605,12 +605,12 @@ int netxen_backup_crbinit(struct netxen_adapter *adapter)
goto
out_kfree
;
/* copy sector 0 to sector 63 */
ret
=
netxen_rom_fast_read_words
(
adapter
,
NETXEN_CRBINIT_START
,
ret
=
netxen_rom_fast_read_words
(
adapter
,
NETXEN_CRBINIT_START
,
buffer
,
NETXEN_FLASH_SECTOR_SIZE
);
if
(
ret
!=
FLASH_SUCCESS
)
goto
out_kfree
;
ret
=
netxen_rom_fast_write_words
(
adapter
,
NETXEN_FIXED_START
,
ret
=
netxen_rom_fast_write_words
(
adapter
,
NETXEN_FIXED_START
,
buffer
,
NETXEN_FLASH_SECTOR_SIZE
);
if
(
ret
!=
FLASH_SUCCESS
)
goto
out_kfree
;
...
...
@@ -658,9 +658,9 @@ static void check_erased_flash(struct netxen_adapter *adapter, int addr)
int
count
=
0
,
erased_errors
=
0
;
int
range
;
range
=
(
addr
==
NETXEN_USER_START
)
?
range
=
(
addr
==
NETXEN_USER_START
)
?
NETXEN_FIXED_START
:
addr
+
NETXEN_FLASH_SECTOR_SIZE
;
for
(
i
=
addr
;
i
<
range
;
i
+=
4
)
{
netxen_rom_fast_read
(
adapter
,
i
,
&
val
);
if
(
val
!=
0xffffffff
)
...
...
@@ -1495,7 +1495,7 @@ static void netxen_post_rx_buffers_nodb(struct netxen_adapter *adapter,
count
++
;
/* now there should be no failure */
pdesc
=
&
rcv_desc
->
desc_head
[
producer
];
skb_reserve
(
skb
,
2
);
/*
/*
* This will be setup when we receive the
* buffer after it has been filled
* skb->dev = netdev;
...
...
drivers/net/netxen/netxen_nic_isr.c
浏览文件 @
4790654c
...
...
@@ -48,7 +48,7 @@ struct net_device_stats *netxen_nic_get_stats(struct net_device *netdev)
/* total packets received */
stats
->
rx_packets
=
adapter
->
stats
.
no_rcv
;
/* total packets transmitted */
stats
->
tx_packets
=
adapter
->
stats
.
xmitedframes
+
stats
->
tx_packets
=
adapter
->
stats
.
xmitedframes
+
adapter
->
stats
.
xmitfinished
;
/* total bytes received */
stats
->
rx_bytes
=
adapter
->
stats
.
rxbytes
;
...
...
@@ -84,7 +84,7 @@ void netxen_handle_port_int(struct netxen_adapter *adapter, u32 enable)
/* This should clear the interrupt source */
if (adapter->phy_read)
adapter->phy_read(adapter,
adapter->phy_read(adapter,
NETXEN_NIU_GB_MII_MGMT_ADDR_INT_STATUS,
&int_src);
if (int_src == 0) {
...
...
@@ -113,7 +113,7 @@ void netxen_handle_port_int(struct netxen_adapter *adapter, u32 enable)
DPRINTK(INFO, "SPEED CHANGED OR LINK STATUS CHANGED \n");
if (adapter->phy_read
&& adapter->phy_read(adapter,
&& adapter->phy_read(adapter,
NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
&status) == 0) {
if (netxen_get_phy_int_link_status_changed(int_src)) {
...
...
@@ -127,7 +127,7 @@ void netxen_handle_port_int(struct netxen_adapter *adapter, u32 enable)
netxen_nic_driver_name,
adapter->netdev->name);
}
netxen_indicate_link_status(adapter,
netxen_indicate_link_status(adapter,
netxen_get_phy_link
(status));
}
...
...
drivers/net/netxen/netxen_nic_main.c
浏览文件 @
4790654c
...
...
@@ -350,7 +350,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
first_page_group_start
=
0
;
first_page_group_end
=
0
;
}
else
{
err
=
-
EIO
;
err
=
-
EIO
;
goto
err_out_free_netdev
;
}
...
...
@@ -410,7 +410,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
netdev
->
open
=
netxen_nic_open
;
netdev
->
stop
=
netxen_nic_close
;
netdev
->
hard_start_xmit
=
netxen_nic_xmit_frame
;
netdev
->
get_stats
=
netxen_nic_get_stats
;
netdev
->
get_stats
=
netxen_nic_get_stats
;
netdev
->
set_multicast_list
=
netxen_nic_set_multi
;
netdev
->
set_mac_address
=
netxen_nic_set_mac
;
netdev
->
change_mtu
=
netxen_nic_change_mtu
;
...
...
@@ -457,8 +457,8 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
adapter
->
max_tx_desc_count
=
MAX_CMD_DESCRIPTORS_HOST
;
if
((
adapter
->
ahw
.
boardcfg
.
board_type
==
NETXEN_BRDTYPE_P2_SB35_4G
)
||
(
adapter
->
ahw
.
boardcfg
.
board_type
==
NETXEN_BRDTYPE_P2_SB31_2G
))
(
adapter
->
ahw
.
boardcfg
.
board_type
==
NETXEN_BRDTYPE_P2_SB31_2G
))
adapter
->
max_rx_desc_count
=
MAX_RCV_DESCRIPTORS_1G
;
else
adapter
->
max_rx_desc_count
=
MAX_RCV_DESCRIPTORS
;
...
...
@@ -583,9 +583,9 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if
(
adapter
->
portnum
==
0
)
{
err
=
netxen_initialize_adapter_offload
(
adapter
);
if
(
err
)
if
(
err
)
goto
err_out_free_rx_buffer
;
val
=
readl
(
NETXEN_CRB_NORMALIZE
(
adapter
,
val
=
readl
(
NETXEN_CRB_NORMALIZE
(
adapter
,
NETXEN_CAM_RAM
(
0x1fc
)));
if
(
val
==
0x55555555
)
{
/* This is the first boot after power up */
...
...
@@ -619,7 +619,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
/*
* Tell the hardware our version number.
*/
i
=
(
_NETXEN_NIC_LINUX_MAJOR
<<
16
)
i
=
(
_NETXEN_NIC_LINUX_MAJOR
<<
16
)
|
((
_NETXEN_NIC_LINUX_MINOR
<<
8
))
|
(
_NETXEN_NIC_LINUX_SUBVERSION
);
writel
(
i
,
NETXEN_CRB_NORMALIZE
(
adapter
,
CRB_DRIVER_VERSION
));
...
...
@@ -659,7 +659,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
break
;
case
NETXEN_NIC_XGBE
:
printk
(
KERN_INFO
"%s: XGbE board initialized
\n
"
,
printk
(
KERN_INFO
"%s: XGbE board initialized
\n
"
,
netxen_nic_driver_name
);
break
;
}
...
...
@@ -930,7 +930,7 @@ static int netxen_nic_close(struct net_device *netdev)
buffrag
++
;
if
(
buffrag
->
dma
)
{
pci_unmap_page
(
adapter
->
pdev
,
buffrag
->
dma
,
buffrag
->
length
,
buffrag
->
length
,
PCI_DMA_TODEVICE
);
buffrag
->
dma
=
0ULL
;
}
...
...
@@ -1194,7 +1194,7 @@ static void netxen_tx_timeout(struct net_device *netdev)
static
void
netxen_tx_timeout_task
(
struct
work_struct
*
work
)
{
struct
netxen_adapter
*
adapter
=
struct
netxen_adapter
*
adapter
=
container_of
(
work
,
struct
netxen_adapter
,
tx_timeout_task
);
printk
(
KERN_ERR
"%s %s: transmit timeout, resetting.
\n
"
,
...
...
drivers/net/netxen/netxen_nic_niu.c
浏览文件 @
4790654c
...
...
@@ -75,7 +75,7 @@ static int phy_unlock(struct netxen_adapter *adapter)
return
0
;
}
/*
/*
* netxen_niu_gbe_phy_read - read a register from the GbE PHY via
* mii management interface.
*
...
...
@@ -88,7 +88,7 @@ static int phy_unlock(struct netxen_adapter *adapter)
* -1 on error
*
*/
int
netxen_niu_gbe_phy_read
(
struct
netxen_adapter
*
adapter
,
long
reg
,
int
netxen_niu_gbe_phy_read
(
struct
netxen_adapter
*
adapter
,
long
reg
,
__u32
*
readval
)
{
long
timeout
=
0
;
...
...
@@ -171,7 +171,7 @@ int netxen_niu_gbe_phy_read(struct netxen_adapter *adapter, long reg,
return
result
;
}
/*
/*
* netxen_niu_gbe_phy_write - write a register to the GbE PHY via
* mii management interface.
*
...
...
@@ -184,7 +184,7 @@ int netxen_niu_gbe_phy_read(struct netxen_adapter *adapter, long reg,
* -1 on error
*
*/
int
netxen_niu_gbe_phy_write
(
struct
netxen_adapter
*
adapter
,
long
reg
,
int
netxen_niu_gbe_phy_write
(
struct
netxen_adapter
*
adapter
,
long
reg
,
__u32
val
)
{
long
timeout
=
0
;
...
...
@@ -275,7 +275,7 @@ int netxen_niu_gbe_enable_phy_interrupts(struct netxen_adapter *adapter)
netxen_set_phy_int_speed_changed
(
enable
);
if
(
0
!=
netxen_niu_gbe_phy_write
(
adapter
,
netxen_niu_gbe_phy_write
(
adapter
,
NETXEN_NIU_GB_MII_MGMT_ADDR_INT_ENABLE
,
enable
))
result
=
-
EIO
;
...
...
@@ -312,7 +312,7 @@ static int netxen_niu_gbe_clear_phy_interrupts(struct netxen_adapter *adapter)
{
int
result
=
0
;
if
(
0
!=
netxen_niu_gbe_phy_write
(
adapter
,
netxen_niu_gbe_phy_write
(
adapter
,
NETXEN_NIU_GB_MII_MGMT_ADDR_INT_STATUS
,
-
EIO
))
result
=
-
EIO
;
...
...
@@ -320,7 +320,7 @@ static int netxen_niu_gbe_clear_phy_interrupts(struct netxen_adapter *adapter)
return
result
;
}
/*
/*
* netxen_niu_gbe_set_mii_mode- Set 10/100 Mbit Mode for GbE MAC
*
*/
...
...
@@ -344,9 +344,9 @@ static void netxen_niu_gbe_set_mii_mode(struct netxen_adapter *adapter,
NETXEN_NIU_GB_MII_MGMT_CONFIG
(
port
),
0x7
);
if
(
enable
)
{
/*
* Do NOT enable flow control until a suitable solution for
* shutting down pause frames is found.
/*
* Do NOT enable flow control until a suitable solution for
* shutting down pause frames is found.
*/
netxen_crb_writelit_adapter
(
adapter
,
NETXEN_NIU_GB_MAC_CONFIG_0
(
port
),
...
...
@@ -359,7 +359,7 @@ static void netxen_niu_gbe_set_mii_mode(struct netxen_adapter *adapter,
printk
(
KERN_ERR
PFX
"ERROR clearing PHY interrupts
\n
"
);
}
/*
/*
* netxen_niu_gbe_set_gmii_mode- Set GbE Mode for GbE MAC
*/
static
void
netxen_niu_gbe_set_gmii_mode
(
struct
netxen_adapter
*
adapter
,
...
...
@@ -382,9 +382,9 @@ static void netxen_niu_gbe_set_gmii_mode(struct netxen_adapter *adapter,
NETXEN_NIU_GB_MII_MGMT_CONFIG
(
port
),
0x7
);
if
(
enable
)
{
/*
* Do NOT enable flow control until a suitable solution for
* shutting down pause frames is found.
/*
* Do NOT enable flow control until a suitable solution for
* shutting down pause frames is found.
*/
netxen_crb_writelit_adapter
(
adapter
,
NETXEN_NIU_GB_MAC_CONFIG_0
(
port
),
...
...
@@ -467,7 +467,7 @@ int netxen_niu_xg_init_port(struct netxen_adapter *adapter, int port)
}
#if 0
/*
/*
* netxen_niu_gbe_handle_phy_interrupt - Handles GbE PHY interrupts
* @param enable 0 means don't enable the port
* 1 means enable (or re-enable) the port
...
...
@@ -623,7 +623,7 @@ int netxen_niu_macaddr_set(struct netxen_adapter *adapter,
(
adapter
,
NETXEN_NIU_GB_STATION_ADDR_0
(
phy
),
&
val
,
4
))
return
-
2
;
netxen_niu_macaddr_get
(
adapter
,
netxen_niu_macaddr_get
(
adapter
,
(
netxen_ethernet_macaddr_t
*
)
mac_addr
);
if
(
memcmp
(
mac_addr
,
addr
,
6
)
==
0
)
break
;
...
...
@@ -753,7 +753,7 @@ int netxen_niu_disable_xg_port(struct netxen_adapter *adapter)
}
/* Set promiscuous mode for a GbE interface */
int
netxen_niu_set_promiscuous_mode
(
struct
netxen_adapter
*
adapter
,
int
netxen_niu_set_promiscuous_mode
(
struct
netxen_adapter
*
adapter
,
netxen_niu_prom_mode_t
mode
)
{
__u32
reg
;
...
...
drivers/net/netxen/netxen_nic_phan_reg.h
浏览文件 @
4790654c
/*
* Copyright (C) 2003 - 2006 NetXen, Inc.
* All rights reserved.
*
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
...
...
@@ -16,10 +16,10 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston,
* MA 02111-1307, USA.
*
*
* The full GNU General Public License is included in this distribution
* in the file called LICENSE.
*
*
* Contact Information:
* info@netxen.com
* NetXen,
...
...
@@ -30,7 +30,7 @@
#ifndef __NIC_PHAN_REG_H_
#define __NIC_PHAN_REG_H_
/*
/*
* CRB Registers or queue message done only at initialization time.
*/
#define NIC_CRB_BASE NETXEN_CAM_RAM(0x200)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录