git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
drivers
/
net
/
skfp
/
skfddi.c
diff --git
a/drivers/net/skfp/skfddi.c
b/drivers/net/skfp/skfddi.c
index
1eee9d3
..
8308bcc
100644
(file)
--- a/
drivers/net/skfp/skfddi.c
+++ b/
drivers/net/skfp/skfddi.c
@@
-1095,7
+1095,7
@@
static int skfp_send_pkt(struct sk_buff *skb, struct net_device *dev)
*/
if (!(skb->len >= FDDI_K_LLC_ZLEN && skb->len <= FDDI_K_LLC_LEN)) {
*/
if (!(skb->len >= FDDI_K_LLC_ZLEN && skb->len <= FDDI_K_LLC_LEN)) {
- bp->MacStat.
tx_errors++;
/* bump error counter */
+ bp->MacStat.
gen.tx_errors++;
/* bump error counter */
// dequeue packets from xmt queue and send them
netif_start_queue(dev);
dev_kfree_skb(skb);
// dequeue packets from xmt queue and send them
netif_start_queue(dev);
dev_kfree_skb(skb);
@@
-1546,8
+1546,8
@@
void mac_drv_tx_complete(struct s_smc *smc, volatile struct s_smt_fp_txd *txd)
skb->len, PCI_DMA_TODEVICE);
txd->txd_os.dma_addr = 0;
skb->len, PCI_DMA_TODEVICE);
txd->txd_os.dma_addr = 0;
- smc->os.MacStat.
tx_packets++;
// Count transmitted packets.
- smc->os.MacStat.
tx_bytes+=skb->len;
// Count bytes
+ smc->os.MacStat.
gen.tx_packets++;
// Count transmitted packets.
+ smc->os.MacStat.
gen.tx_bytes+=skb->len;
// Count bytes
// free the skb
dev_kfree_skb_irq(skb);
// free the skb
dev_kfree_skb_irq(skb);
@@
-1629,7
+1629,7
@@
void mac_drv_rx_complete(struct s_smc *smc, volatile struct s_smt_fp_rxd *rxd,
skb = rxd->rxd_os.skb;
if (!skb) {
PRINTK(KERN_INFO "No skb in rxd\n");
skb = rxd->rxd_os.skb;
if (!skb) {
PRINTK(KERN_INFO "No skb in rxd\n");
- smc->os.MacStat.rx_errors++;
+ smc->os.MacStat.
gen.
rx_errors++;
goto RequeueRxd;
}
virt = skb->data;
goto RequeueRxd;
}
virt = skb->data;
@@
-1682,13
+1682,14
@@
void mac_drv_rx_complete(struct s_smc *smc, volatile struct s_smt_fp_rxd *rxd,
}
// Count statistics.
}
// Count statistics.
- smc->os.MacStat.rx_packets++; // Count indicated receive packets.
- smc->os.MacStat.rx_bytes+=len; // Count bytes
+ smc->os.MacStat.gen.rx_packets++; // Count indicated receive
+ // packets.
+ smc->os.MacStat.gen.rx_bytes+=len; // Count bytes.
// virt points to header again
if (virt[1] & 0x01) { // Check group (multicast) bit.
// virt points to header again
if (virt[1] & 0x01) { // Check group (multicast) bit.
- smc->os.MacStat.multicast++;
+ smc->os.MacStat.
gen.
multicast++;
}
// deliver frame to system
}
// deliver frame to system
@@
-1706,7
+1707,8
@@
void mac_drv_rx_complete(struct s_smc *smc, volatile struct s_smt_fp_rxd *rxd,
RequeueRxd:
PRINTK(KERN_INFO "Rx: re-queue RXD.\n");
mac_drv_requeue_rxd(smc, rxd, frag_count);
RequeueRxd:
PRINTK(KERN_INFO "Rx: re-queue RXD.\n");
mac_drv_requeue_rxd(smc, rxd, frag_count);
- smc->os.MacStat.rx_errors++; // Count receive packets not indicated.
+ smc->os.MacStat.gen.rx_errors++; // Count receive packets
+ // not indicated.
} // mac_drv_rx_complete
} // mac_drv_rx_complete
@@
-2081,7
+2083,7
@@
void smt_stat_counter(struct s_smc *smc, int stat)
break;
case 1:
PRINTK(KERN_INFO "Receive fifo overflow.\n");
break;
case 1:
PRINTK(KERN_INFO "Receive fifo overflow.\n");
- smc->os.MacStat.rx_errors++;
+ smc->os.MacStat.
gen.
rx_errors++;
break;
default:
PRINTK(KERN_INFO "Unknown status (%d).\n", stat);
break;
default:
PRINTK(KERN_INFO "Unknown status (%d).\n", stat);