diff options
author | Alexander Beregalov <a.beregalov@gmail.com> | 2009-01-08 19:42:08 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-01-11 03:01:31 -0500 |
commit | 216c32d4407ea6951d6832773fdb3de058e12c62 (patch) | |
tree | baffe207bb71b509a536a7d5216545192b3cbbe1 /drivers/net/irda | |
parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) |
irda: fix incomplete conversation to internal stats
Fix for commit af0490810c (irda: convert to internal stats)
Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/irda')
-rw-r--r-- | drivers/net/irda/au1k_ir.c | 2 | ||||
-rw-r--r-- | drivers/net/irda/donauboe.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/irda/au1k_ir.c b/drivers/net/irda/au1k_ir.c index 75a1d0a86dee..941164076a2b 100644 --- a/drivers/net/irda/au1k_ir.c +++ b/drivers/net/irda/au1k_ir.c | |||
@@ -594,7 +594,7 @@ static int au1k_irda_rx(struct net_device *dev) | |||
594 | update_rx_stats(dev, flags, count); | 594 | update_rx_stats(dev, flags, count); |
595 | skb=alloc_skb(count+1,GFP_ATOMIC); | 595 | skb=alloc_skb(count+1,GFP_ATOMIC); |
596 | if (skb == NULL) { | 596 | if (skb == NULL) { |
597 | aup->stats.rx_dropped++; | 597 | aup->netdev->stats.rx_dropped++; |
598 | continue; | 598 | continue; |
599 | } | 599 | } |
600 | skb_reserve(skb, 1); | 600 | skb_reserve(skb, 1); |
diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c index 687c2d53d4d2..6f3e7f71658d 100644 --- a/drivers/net/irda/donauboe.c +++ b/drivers/net/irda/donauboe.c | |||
@@ -1194,13 +1194,13 @@ toshoboe_interrupt (int irq, void *dev_id) | |||
1194 | txp = txpc; | 1194 | txp = txpc; |
1195 | txpc++; | 1195 | txpc++; |
1196 | txpc %= TX_SLOTS; | 1196 | txpc %= TX_SLOTS; |
1197 | self->stats.tx_packets++; | 1197 | self->netdev->stats.tx_packets++; |
1198 | if (self->ring->tx[txpc].control & OBOE_CTL_TX_HW_OWNS) | 1198 | if (self->ring->tx[txpc].control & OBOE_CTL_TX_HW_OWNS) |
1199 | self->ring->tx[txp].control &= ~OBOE_CTL_TX_RTCENTX; | 1199 | self->ring->tx[txp].control &= ~OBOE_CTL_TX_RTCENTX; |
1200 | } | 1200 | } |
1201 | self->stats.tx_packets--; | 1201 | self->netdev->stats.tx_packets--; |
1202 | #else | 1202 | #else |
1203 | self->stats.tx_packets++; | 1203 | self->netdev->stats.tx_packets++; |
1204 | #endif | 1204 | #endif |
1205 | toshoboe_start_DMA(self, OBOE_CONFIG0H_ENTX); | 1205 | toshoboe_start_DMA(self, OBOE_CONFIG0H_ENTX); |
1206 | } | 1206 | } |
@@ -1280,7 +1280,7 @@ dumpbufs(self->rx_bufs[self->rxs],len,'<'); | |||
1280 | skb_put (skb, len); | 1280 | skb_put (skb, len); |
1281 | skb_copy_to_linear_data(skb, self->rx_bufs[self->rxs], | 1281 | skb_copy_to_linear_data(skb, self->rx_bufs[self->rxs], |
1282 | len); | 1282 | len); |
1283 | self->stats.rx_packets++; | 1283 | self->netdev->stats.rx_packets++; |
1284 | skb->dev = self->netdev; | 1284 | skb->dev = self->netdev; |
1285 | skb_reset_mac_header(skb); | 1285 | skb_reset_mac_header(skb); |
1286 | skb->protocol = htons (ETH_P_IRDA); | 1286 | skb->protocol = htons (ETH_P_IRDA); |