git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
net
/
cpmac.c
diff --git
a/drivers/net/cpmac.c
b/drivers/net/cpmac.c
index
f665487
..
3f476c7
100644
(file)
--- a/
drivers/net/cpmac.c
+++ b/
drivers/net/cpmac.c
@@
-428,7
+428,7
@@
static int cpmac_poll(struct napi_struct *napi, int budget)
printk(KERN_WARNING "%s: rx: polling, but no queue\n",
priv->dev->name);
spin_unlock(&priv->rx_lock);
printk(KERN_WARNING "%s: rx: polling, but no queue\n",
priv->dev->name);
spin_unlock(&priv->rx_lock);
- n
etif_rx
_complete(napi);
+ n
api
_complete(napi);
return 0;
}
return 0;
}
@@
-514,7
+514,7
@@
static int cpmac_poll(struct napi_struct *napi, int budget)
if (processed == 0) {
/* we ran out of packets to read,
* revert to interrupt-driven mode */
if (processed == 0) {
/* we ran out of packets to read,
* revert to interrupt-driven mode */
- n
etif_rx
_complete(napi);
+ n
api
_complete(napi);
cpmac_write(priv->regs, CPMAC_RX_INT_ENABLE, 1);
return 0;
}
cpmac_write(priv->regs, CPMAC_RX_INT_ENABLE, 1);
return 0;
}
@@
-536,7
+536,7
@@
fatal_error:
}
spin_unlock(&priv->rx_lock);
}
spin_unlock(&priv->rx_lock);
- n
etif_rx
_complete(napi);
+ n
api
_complete(napi);
netif_tx_stop_all_queues(priv->dev);
napi_disable(&priv->napi);
netif_tx_stop_all_queues(priv->dev);
napi_disable(&priv->napi);
@@
-802,9
+802,9
@@
static irqreturn_t cpmac_irq(int irq, void *dev_id)
if (status & MAC_INT_RX) {
queue = (status >> 8) & 7;
if (status & MAC_INT_RX) {
queue = (status >> 8) & 7;
- if (n
etif_rx
_schedule_prep(&priv->napi)) {
+ if (n
api
_schedule_prep(&priv->napi)) {
cpmac_write(priv->regs, CPMAC_RX_INT_CLEAR, 1 << queue);
cpmac_write(priv->regs, CPMAC_RX_INT_CLEAR, 1 << queue);
- __n
etif_rx
_schedule(&priv->napi);
+ __n
api
_schedule(&priv->napi);
}
}
}
}
@@
-1161,7
+1161,7
@@
static int __devinit cpmac_probe(struct platform_device *pdev)
priv->msg_enable = netif_msg_init(debug_level, 0xff);
memcpy(dev->dev_addr, pdata->dev_addr, sizeof(dev->dev_addr));
priv->msg_enable = netif_msg_init(debug_level, 0xff);
memcpy(dev->dev_addr, pdata->dev_addr, sizeof(dev->dev_addr));
- priv->phy = phy_connect(dev,
cpmac_mii->phy_map[phy_id]->dev.bus_id
,
+ priv->phy = phy_connect(dev,
dev_name(&cpmac_mii->phy_map[phy_id]->dev)
,
&cpmac_adjust_link, 0, PHY_INTERFACE_MODE_MII);
if (IS_ERR(priv->phy)) {
if (netif_msg_drv(priv))
&cpmac_adjust_link, 0, PHY_INTERFACE_MODE_MII);
if (IS_ERR(priv->phy)) {
if (netif_msg_drv(priv))