projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[NET] drivers/net: statistics cleanup #1 -- save memory and shrink code
[deliverable/linux.git]
/
drivers
/
net
/
rrunner.c
diff --git
a/drivers/net/rrunner.c
b/drivers/net/rrunner.c
index 41f877d482c70645a109492b6d2905eac48205d2..03facba0525904e00ac26b8a908950a8538c61ff 100644
(file)
--- a/
drivers/net/rrunner.c
+++ b/
drivers/net/rrunner.c
@@
-126,7
+126,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);
@@
-808,7
+807,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",
@@
-817,7
+816,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",
@@
-833,7
+832,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();
@@
-973,7
+972,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;
}
@@
-986,7
+985,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,
@@
-1024,7
+1023,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;
}
}
@@
-1033,8
+1032,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;
@@
-1102,8
+1101,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,
@@
-1491,16
+1490,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)
This page took
0.026456 seconds
and
5
git commands to generate.