projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
iwl3945: use iwl_get_hw_mode
[deliverable/linux.git]
/
drivers
/
net
/
pasemi_mac.c
diff --git
a/drivers/net/pasemi_mac.c
b/drivers/net/pasemi_mac.c
index d0349e7d73ea9d873a4ce23afe6ae6e262e55fdb..5eeb5a87b7387ede885f565ea9409da99a704865 100644
(file)
--- a/
drivers/net/pasemi_mac.c
+++ b/
drivers/net/pasemi_mac.c
@@
-970,7
+970,7
@@
static irqreturn_t pasemi_mac_rx_intr(int irq, void *data)
if (*chan->status & PAS_STATUS_ERROR)
reg |= PAS_IOB_DMA_RXCH_RESET_DINTC;
if (*chan->status & PAS_STATUS_ERROR)
reg |= PAS_IOB_DMA_RXCH_RESET_DINTC;
- n
etif_rx
_schedule(&mac->napi);
+ n
api
_schedule(&mac->napi);
write_iob_reg(PAS_IOB_DMA_RXCH_RESET(chan->chno), reg);
write_iob_reg(PAS_IOB_DMA_RXCH_RESET(chan->chno), reg);
@@
-1010,7
+1010,7
@@
static irqreturn_t pasemi_mac_tx_intr(int irq, void *data)
mod_timer(&txring->clean_timer, jiffies + (TX_CLEAN_INTERVAL)*2);
mod_timer(&txring->clean_timer, jiffies + (TX_CLEAN_INTERVAL)*2);
- n
etif_rx
_schedule(&mac->napi);
+ n
api
_schedule(&mac->napi);
if (reg)
write_iob_reg(PAS_IOB_DMA_TXCH_RESET(chan->chno), reg);
if (reg)
write_iob_reg(PAS_IOB_DMA_TXCH_RESET(chan->chno), reg);
@@
-1639,7
+1639,7
@@
static int pasemi_mac_poll(struct napi_struct *napi, int budget)
pkts = pasemi_mac_clean_rx(rx_ring(mac), budget);
if (pkts < budget) {
/* all done, no more packets present */
pkts = pasemi_mac_clean_rx(rx_ring(mac), budget);
if (pkts < budget) {
/* all done, no more packets present */
- n
etif_rx
_complete(napi);
+ n
api
_complete(napi);
pasemi_mac_restart_rx_intr(mac);
pasemi_mac_restart_tx_intr(mac);
pasemi_mac_restart_rx_intr(mac);
pasemi_mac_restart_tx_intr(mac);
This page took
0.025351 seconds
and
5
git commands to generate.