git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Preparations to caching root in path_walk()
[safe/jmp/linux-2.6]
/
drivers
/
net
/
sungem.c
diff --git
a/drivers/net/sungem.c
b/drivers/net/sungem.c
index
4918763
..
d2dfe0a
100644
(file)
--- a/
drivers/net/sungem.c
+++ b/
drivers/net/sungem.c
@@
-921,7
+921,7
@@
static int gem_poll(struct napi_struct *napi, int budget)
gp->status = readl(gp->regs + GREG_STAT);
} while (gp->status & GREG_STAT_NAPI);
gp->status = readl(gp->regs + GREG_STAT);
} while (gp->status & GREG_STAT_NAPI);
- __n
etif_rx
_complete(napi);
+ __n
api
_complete(napi);
gem_enable_ints(gp);
spin_unlock_irqrestore(&gp->lock, flags);
gem_enable_ints(gp);
spin_unlock_irqrestore(&gp->lock, flags);
@@
-944,7
+944,7
@@
static irqreturn_t gem_interrupt(int irq, void *dev_id)
spin_lock_irqsave(&gp->lock, flags);
spin_lock_irqsave(&gp->lock, flags);
- if (n
etif_rx
_schedule_prep(&gp->napi)) {
+ if (n
api
_schedule_prep(&gp->napi)) {
u32 gem_status = readl(gp->regs + GREG_STAT);
if (gem_status == 0) {
u32 gem_status = readl(gp->regs + GREG_STAT);
if (gem_status == 0) {
@@
-954,7
+954,7
@@
static irqreturn_t gem_interrupt(int irq, void *dev_id)
}
gp->status = gem_status;
gem_disable_ints(gp);
}
gp->status = gem_status;
gem_disable_ints(gp);
- __n
etif_rx
_schedule(&gp->napi);
+ __n
api
_schedule(&gp->napi);
}
spin_unlock_irqrestore(&gp->lock, flags);
}
spin_unlock_irqrestore(&gp->lock, flags);
@@
-1157,7
+1157,7
@@
static void gem_pcs_reset(struct gem *gp)
if (limit-- <= 0)
break;
}
if (limit-- <= 0)
break;
}
- if (limit <
=
0)
+ if (limit < 0)
printk(KERN_WARNING "%s: PCS reset bit would not clear.\n",
gp->dev->name);
}
printk(KERN_WARNING "%s: PCS reset bit would not clear.\n",
gp->dev->name);
}
@@
-1229,7
+1229,7
@@
static void gem_reset(struct gem *gp)
break;
} while (val & (GREG_SWRST_TXRST | GREG_SWRST_RXRST));
break;
} while (val & (GREG_SWRST_TXRST | GREG_SWRST_RXRST));
- if (limit <
=
0)
+ if (limit < 0)
printk(KERN_ERR "%s: SW reset is ghetto.\n", gp->dev->name);
if (gp->phy_type == phy_serialink || gp->phy_type == phy_serdes)
printk(KERN_ERR "%s: SW reset is ghetto.\n", gp->dev->name);
if (gp->phy_type == phy_serialink || gp->phy_type == phy_serdes)
@@
-2998,8
+2998,11
@@
static const struct net_device_ops gem_netdev_ops = {
.ndo_do_ioctl = gem_ioctl,
.ndo_tx_timeout = gem_tx_timeout,
.ndo_change_mtu = gem_change_mtu,
.ndo_do_ioctl = gem_ioctl,
.ndo_tx_timeout = gem_tx_timeout,
.ndo_change_mtu = gem_change_mtu,
- .ndo_set_mac_address = eth_mac_addr,
.ndo_validate_addr = eth_validate_addr,
.ndo_validate_addr = eth_validate_addr,
+ .ndo_set_mac_address = gem_set_mac_address,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+ .ndo_poll_controller = gem_poll_controller,
+#endif
};
static int __devinit gem_init_one(struct pci_dev *pdev,
};
static int __devinit gem_init_one(struct pci_dev *pdev,
@@
-3039,10
+3042,10
@@
static int __devinit gem_init_one(struct pci_dev *pdev,
*/
if (pdev->vendor == PCI_VENDOR_ID_SUN &&
pdev->device == PCI_DEVICE_ID_SUN_GEM &&
*/
if (pdev->vendor == PCI_VENDOR_ID_SUN &&
pdev->device == PCI_DEVICE_ID_SUN_GEM &&
- !pci_set_dma_mask(pdev, DMA_
64BIT_MASK
)) {
+ !pci_set_dma_mask(pdev, DMA_
BIT_MASK(64)
)) {
pci_using_dac = 1;
} else {
pci_using_dac = 1;
} else {
- err = pci_set_dma_mask(pdev, DMA_
32BIT_MASK
);
+ err = pci_set_dma_mask(pdev, DMA_
BIT_MASK(32)
);
if (err) {
printk(KERN_ERR PFX "No usable DMA configuration, "
"aborting.\n");
if (err) {
printk(KERN_ERR PFX "No usable DMA configuration, "
"aborting.\n");
@@
-3161,10
+3164,6
@@
static int __devinit gem_init_one(struct pci_dev *pdev,
dev->watchdog_timeo = 5 * HZ;
dev->irq = pdev->irq;
dev->dma = 0;
dev->watchdog_timeo = 5 * HZ;
dev->irq = pdev->irq;
dev->dma = 0;
- dev->set_mac_address = gem_set_mac_address;
-#ifdef CONFIG_NET_POLL_CONTROLLER
- dev->poll_controller = gem_poll_controller;
-#endif
/* Set that now, in case PM kicks in now */
pci_set_drvdata(pdev, dev);
/* Set that now, in case PM kicks in now */
pci_set_drvdata(pdev, dev);