git.samba.org
/
sfrench
/
cifs-2.6.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/wim/linux-2.6-watchdog
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
rrunner.c
diff --git
a/drivers/net/rrunner.c
b/drivers/net/rrunner.c
index 25c73d47daad9c29c0bb52e5c9035efbd9818909..b822859c8de31079dbb100c4cf91a1947fc87184 100644
(file)
--- a/
drivers/net/rrunner.c
+++ b/
drivers/net/rrunner.c
@@
-79,12
+79,10
@@
static char version[] __devinitdata = "rrunner.c: v0.50 11/11/2002 Jes Sorensen
*/
/*
*/
/*
- *
These are checked at init time to see if they are at least 256KB
- *
and increased to 256KB if they are not. This is done to avoid ending
- * up with socket buffers smaller than the MTU size,
+ *
sysctl_[wr]mem_max are checked at init time to see if they are at
+ *
least 256KB and increased to 256KB if they are not. This is done to
+ *
avoid ending
up with socket buffers smaller than the MTU size,
*/
*/
-extern __u32 sysctl_wmem_max;
-extern __u32 sysctl_rmem_max;
static int __devinit rr_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent)
static int __devinit rr_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent)
@@
-109,7
+107,6
@@
static int __devinit rr_init_one(struct pci_dev *pdev,
rrpriv = netdev_priv(dev);
rrpriv = netdev_priv(dev);
- SET_MODULE_OWNER(dev);
SET_NETDEV_DEV(dev, &pdev->dev);
if (pci_request_regions(pdev, "rrunner")) {
SET_NETDEV_DEV(dev, &pdev->dev);
if (pci_request_regions(pdev, "rrunner")) {
@@
-127,7
+124,6
@@
static int __devinit rr_init_one(struct pci_dev *pdev,
dev->open = &rr_open;
dev->hard_start_xmit = &rr_start_xmit;
dev->stop = &rr_close;
dev->open = &rr_open;
dev->hard_start_xmit = &rr_start_xmit;
dev->stop = &rr_close;
- dev->get_stats = &rr_get_stats;
dev->do_ioctl = &rr_ioctl;
dev->base_addr = pci_resource_start(pdev, 0);
dev->do_ioctl = &rr_ioctl;
dev->base_addr = pci_resource_start(pdev, 0);
@@
-516,13
+512,13
@@
static unsigned int write_eeprom(struct rr_private *rrpriv,
}
}
-static int __init rr_init(struct net_device *dev)
+static int __
dev
init rr_init(struct net_device *dev)
{
struct rr_private *rrpriv;
struct rr_regs __iomem *regs;
struct eeprom *hw = NULL;
u32 sram_size, rev;
{
struct rr_private *rrpriv;
struct rr_regs __iomem *regs;
struct eeprom *hw = NULL;
u32 sram_size, rev;
-
int i
;
+
DECLARE_MAC_BUF(mac)
;
rrpriv = netdev_priv(dev);
regs = rrpriv->regs;
rrpriv = netdev_priv(dev);
regs = rrpriv->regs;
@@
-560,11
+556,7
@@
static int __init rr_init(struct net_device *dev)
*(u32 *)(dev->dev_addr+2) =
htonl(rr_read_eeprom_word(rrpriv, &hw->manf.BoardULA[4]));
*(u32 *)(dev->dev_addr+2) =
htonl(rr_read_eeprom_word(rrpriv, &hw->manf.BoardULA[4]));
- printk(" MAC: ");
-
- for (i = 0; i < 5; i++)
- printk("%2.2x:", dev->dev_addr[i]);
- printk("%2.2x\n", dev->dev_addr[i]);
+ printk(" MAC: %s\n", print_mac(mac, dev->dev_addr));
sram_size = rr_read_eeprom_word(rrpriv, (void *)8);
printk(" SRAM size 0x%06x\n", sram_size);
sram_size = rr_read_eeprom_word(rrpriv, (void *)8);
printk(" SRAM size 0x%06x\n", sram_size);
@@
-809,7
+801,7
@@
static u32 rr_handle_event(struct net_device *dev, u32 prodidx, u32 eidx)
case E_CON_REJ:
printk(KERN_WARNING "%s: Connection rejected\n",
dev->name);
case E_CON_REJ:
printk(KERN_WARNING "%s: Connection rejected\n",
dev->name);
-
rrpri
v->stats.tx_aborted_errors++;
+
de
v->stats.tx_aborted_errors++;
break;
case E_CON_TMOUT:
printk(KERN_WARNING "%s: Connection timeout\n",
break;
case E_CON_TMOUT:
printk(KERN_WARNING "%s: Connection timeout\n",
@@
-818,7
+810,7
@@
static u32 rr_handle_event(struct net_device *dev, u32 prodidx, u32 eidx)
case E_DISC_ERR:
printk(KERN_WARNING "%s: HIPPI disconnect error\n",
dev->name);
case E_DISC_ERR:
printk(KERN_WARNING "%s: HIPPI disconnect error\n",
dev->name);
-
rrpri
v->stats.tx_aborted_errors++;
+
de
v->stats.tx_aborted_errors++;
break;
case E_INT_PRTY:
printk(KERN_ERR "%s: HIPPI Internal Parity error\n",
break;
case E_INT_PRTY:
printk(KERN_ERR "%s: HIPPI Internal Parity error\n",
@@
-834,7
+826,7
@@
static u32 rr_handle_event(struct net_device *dev, u32 prodidx, u32 eidx)
case E_TX_LINK_DROP:
printk(KERN_WARNING "%s: Link lost during transmit\n",
dev->name);
case E_TX_LINK_DROP:
printk(KERN_WARNING "%s: Link lost during transmit\n",
dev->name);
-
rrpri
v->stats.tx_aborted_errors++;
+
de
v->stats.tx_aborted_errors++;
writel(readl(®s->HostCtrl)|HALT_NIC|RR_CLEAR_INT,
®s->HostCtrl);
wmb();
writel(readl(®s->HostCtrl)|HALT_NIC|RR_CLEAR_INT,
®s->HostCtrl);
wmb();
@@
-974,7
+966,7
@@
static void rx_int(struct net_device *dev, u32 rxlimit, u32 index)
printk("len %x, mode %x\n", pkt_len, desc->mode);
#endif
if ( (rrpriv->rx_ring[index].mode & PACKET_BAD) == PACKET_BAD){
printk("len %x, mode %x\n", pkt_len, desc->mode);
#endif
if ( (rrpriv->rx_ring[index].mode & PACKET_BAD) == PACKET_BAD){
-
rrpri
v->stats.rx_dropped++;
+
de
v->stats.rx_dropped++;
goto defer;
}
goto defer;
}
@@
-987,7
+979,7
@@
static void rx_int(struct net_device *dev, u32 rxlimit, u32 index)
skb = alloc_skb(pkt_len, GFP_ATOMIC);
if (skb == NULL){
printk(KERN_WARNING "%s: Unable to allocate skb (%i bytes), deferring packet\n", dev->name, pkt_len);
skb = alloc_skb(pkt_len, GFP_ATOMIC);
if (skb == NULL){
printk(KERN_WARNING "%s: Unable to allocate skb (%i bytes), deferring packet\n", dev->name, pkt_len);
-
rrpri
v->stats.rx_dropped++;
+
de
v->stats.rx_dropped++;
goto defer;
} else {
pci_dma_sync_single_for_cpu(rrpriv->pci_dev,
goto defer;
} else {
pci_dma_sync_single_for_cpu(rrpriv->pci_dev,
@@
-1025,7
+1017,7
@@
static void rx_int(struct net_device *dev, u32 rxlimit, u32 index)
} else {
printk("%s: Out of memory, deferring "
"packet\n", dev->name);
} else {
printk("%s: Out of memory, deferring "
"packet\n", dev->name);
-
rrpri
v->stats.rx_dropped++;
+
de
v->stats.rx_dropped++;
goto defer;
}
}
goto defer;
}
}
@@
-1034,8
+1026,8
@@
static void rx_int(struct net_device *dev, u32 rxlimit, u32 index)
netif_rx(skb); /* send it up */
dev->last_rx = jiffies;
netif_rx(skb); /* send it up */
dev->last_rx = jiffies;
-
rrpri
v->stats.rx_packets++;
-
rrpri
v->stats.rx_bytes += pkt_len;
+
de
v->stats.rx_packets++;
+
de
v->stats.rx_bytes += pkt_len;
}
defer:
desc->mode = 0;
}
defer:
desc->mode = 0;
@@
-1103,8
+1095,8
@@
static irqreturn_t rr_interrupt(int irq, void *dev_id)
desc = &(rrpriv->tx_ring[txcon]);
skb = rrpriv->tx_skbuff[txcon];
desc = &(rrpriv->tx_ring[txcon]);
skb = rrpriv->tx_skbuff[txcon];
-
rrpri
v->stats.tx_packets++;
-
rrpri
v->stats.tx_bytes += skb->len;
+
de
v->stats.tx_packets++;
+
de
v->stats.tx_bytes += skb->len;
pci_unmap_single(rrpriv->pci_dev,
desc->addr.addrlo, skb->len,
pci_unmap_single(rrpriv->pci_dev,
desc->addr.addrlo, skb->len,
@@
-1492,16
+1484,6
@@
static int rr_start_xmit(struct sk_buff *skb, struct net_device *dev)
}
}
-static struct net_device_stats *rr_get_stats(struct net_device *dev)
-{
- struct rr_private *rrpriv;
-
- rrpriv = netdev_priv(dev);
-
- return(&rrpriv->stats);
-}
-
-
/*
* Read the firmware out of the EEPROM and put it into the SRAM
* (or from user space - later)
/*
* Read the firmware out of the EEPROM and put it into the SRAM
* (or from user space - later)