Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
5325a7bf
Commit
5325a7bf
authored
Feb 24, 2009
by
David S. Miller
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
parents
e70049b9
028e1415
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
4 deletions
+12
-4
drivers/net/netxen/netxen_nic_main.c
drivers/net/netxen/netxen_nic_main.c
+12
-4
No files found.
drivers/net/netxen/netxen_nic_main.c
View file @
5325a7bf
...
@@ -588,7 +588,12 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
...
@@ -588,7 +588,12 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
adapter
->
pci_mem_read
=
netxen_nic_pci_mem_read_2M
;
adapter
->
pci_mem_read
=
netxen_nic_pci_mem_read_2M
;
adapter
->
pci_mem_write
=
netxen_nic_pci_mem_write_2M
;
adapter
->
pci_mem_write
=
netxen_nic_pci_mem_write_2M
;
mem_ptr0
=
ioremap
(
mem_base
,
mem_len
);
mem_ptr0
=
pci_ioremap_bar
(
pdev
,
0
);
if
(
mem_ptr0
==
NULL
)
{
dev_err
(
&
pdev
->
dev
,
"failed to map PCI bar 0
\n
"
);
return
-
EIO
;
}
pci_len0
=
mem_len
;
pci_len0
=
mem_len
;
first_page_group_start
=
0
;
first_page_group_start
=
0
;
first_page_group_end
=
0
;
first_page_group_end
=
0
;
...
@@ -796,9 +801,12 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
...
@@ -796,9 +801,12 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
* See if the firmware gave us a virtual-physical port mapping.
* See if the firmware gave us a virtual-physical port mapping.
*/
*/
adapter
->
physical_port
=
adapter
->
portnum
;
adapter
->
physical_port
=
adapter
->
portnum
;
i
=
adapter
->
pci_read_normalize
(
adapter
,
CRB_V2P
(
adapter
->
portnum
));
if
(
adapter
->
fw_major
<
4
)
{
i
=
adapter
->
pci_read_normalize
(
adapter
,
CRB_V2P
(
adapter
->
portnum
));
if
(
i
!=
0x55555555
)
if
(
i
!=
0x55555555
)
adapter
->
physical_port
=
i
;
adapter
->
physical_port
=
i
;
}
adapter
->
flags
&=
~
(
NETXEN_NIC_MSI_ENABLED
|
NETXEN_NIC_MSIX_ENABLED
);
adapter
->
flags
&=
~
(
NETXEN_NIC_MSI_ENABLED
|
NETXEN_NIC_MSIX_ENABLED
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment