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
Kirill Smelkov
linux
Commits
f0c88f9c
Commit
f0c88f9c
authored
Mar 25, 2008
by
Jeff Garzik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
netxen, phy/marvell, skge: minor checkpatch fixes
Signed-off-by:
Jeff Garzik
<
jgarzik@redhat.com
>
parent
f6f4bfa3
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
6 deletions
+4
-6
drivers/net/netxen/netxen_nic_init.c
drivers/net/netxen/netxen_nic_init.c
+1
-2
drivers/net/netxen/netxen_nic_main.c
drivers/net/netxen/netxen_nic_main.c
+1
-2
drivers/net/phy/marvell.c
drivers/net/phy/marvell.c
+1
-1
drivers/net/skge.c
drivers/net/skge.c
+1
-1
No files found.
drivers/net/netxen/netxen_nic_init.c
View file @
f0c88f9c
...
@@ -1144,9 +1144,8 @@ u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctxid, int max)
...
@@ -1144,9 +1144,8 @@ u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctxid, int max)
consumer
=
(
consumer
+
1
)
&
(
adapter
->
max_rx_desc_count
-
1
);
consumer
=
(
consumer
+
1
)
&
(
adapter
->
max_rx_desc_count
-
1
);
count
++
;
count
++
;
}
}
for
(
ring
=
0
;
ring
<
NUM_RCV_DESC_RINGS
;
ring
++
)
{
for
(
ring
=
0
;
ring
<
NUM_RCV_DESC_RINGS
;
ring
++
)
netxen_post_rx_buffers_nodb
(
adapter
,
ctxid
,
ring
);
netxen_post_rx_buffers_nodb
(
adapter
,
ctxid
,
ring
);
}
/* update the consumer index in phantom */
/* update the consumer index in phantom */
if
(
count
)
{
if
(
count
)
{
...
...
drivers/net/netxen/netxen_nic_main.c
View file @
f0c88f9c
...
@@ -166,9 +166,8 @@ static void netxen_nic_disable_int(struct netxen_adapter *adapter)
...
@@ -166,9 +166,8 @@ static void netxen_nic_disable_int(struct netxen_adapter *adapter)
int
port
=
adapter
->
portnum
;
int
port
=
adapter
->
portnum
;
int
pci_fn
=
adapter
->
ahw
.
pci_func
;
int
pci_fn
=
adapter
->
ahw
.
pci_func
;
if
(
adapter
->
msi_mode
!=
MSI_MODE_MULTIFUNC
)
{
if
(
adapter
->
msi_mode
!=
MSI_MODE_MULTIFUNC
)
writel
(
0x0
,
NETXEN_CRB_NORMALIZE
(
adapter
,
sw_int_mask
[
port
]));
writel
(
0x0
,
NETXEN_CRB_NORMALIZE
(
adapter
,
sw_int_mask
[
port
]));
}
if
(
adapter
->
intr_scheme
!=
-
1
&&
if
(
adapter
->
intr_scheme
!=
-
1
&&
adapter
->
intr_scheme
!=
INTR_SCHEME_PERPORT
)
adapter
->
intr_scheme
!=
INTR_SCHEME_PERPORT
)
...
...
drivers/net/phy/marvell.c
View file @
f0c88f9c
...
@@ -297,7 +297,7 @@ static int m88e1145_config_init(struct phy_device *phydev)
...
@@ -297,7 +297,7 @@ static int m88e1145_config_init(struct phy_device *phydev)
/* marvell_read_status
/* marvell_read_status
*
*
* Generic status code does not detect Fiber correctly!
* Generic status code does not detect Fiber correctly!
* Description:
* Description:
* Check the link, then figure out the current state
* Check the link, then figure out the current state
* by comparing what we advertise with what the link partner
* by comparing what we advertise with what the link partner
* advertises. Start by checking the gigabit possibilities,
* advertises. Start by checking the gigabit possibilities,
...
...
drivers/net/skge.c
View file @
f0c88f9c
...
@@ -3200,7 +3200,7 @@ static int skge_poll(struct napi_struct *napi, int to_do)
...
@@ -3200,7 +3200,7 @@ static int skge_poll(struct napi_struct *napi, int to_do)
if
(
work_done
<
to_do
)
{
if
(
work_done
<
to_do
)
{
unsigned
long
flags
;
unsigned
long
flags
;
spin_lock_irqsave
(
&
hw
->
hw_lock
,
flags
);
spin_lock_irqsave
(
&
hw
->
hw_lock
,
flags
);
__netif_rx_complete
(
dev
,
napi
);
__netif_rx_complete
(
dev
,
napi
);
hw
->
intr_mask
|=
napimask
[
skge
->
port
];
hw
->
intr_mask
|=
napimask
[
skge
->
port
];
...
...
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