diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/bcm/Qos.c | 7 | ||||
-rw-r--r-- | drivers/staging/bcm/Transmit.c | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c index 8ce4536e6e28..feade9451b2e 100644 --- a/drivers/staging/bcm/Qos.c +++ b/drivers/staging/bcm/Qos.c | |||
@@ -359,12 +359,11 @@ static VOID PruneQueue(PMINI_ADAPTER Adapter, INT iIndex) | |||
359 | 359 | ||
360 | if(PacketToDrop) | 360 | if(PacketToDrop) |
361 | { | 361 | { |
362 | struct netdev_queue *txq = netdev_get_tx_queue(Adapter->dev, iIndex); | ||
363 | if (netif_msg_tx_err(Adapter)) | 362 | if (netif_msg_tx_err(Adapter)) |
364 | pr_info(PFX "%s: tx queue %d overlimit\n", | 363 | pr_info(PFX "%s: tx queue %d overlimit\n", |
365 | Adapter->dev->name, iIndex); | 364 | Adapter->dev->name, iIndex); |
366 | 365 | ||
367 | txq->tx_dropped++; | 366 | netstats->tx_dropped++; |
368 | 367 | ||
369 | DEQUEUEPACKET(Adapter->PackInfo[iIndex].FirstTxQueue, | 368 | DEQUEUEPACKET(Adapter->PackInfo[iIndex].FirstTxQueue, |
370 | Adapter->PackInfo[iIndex].LastTxQueue); | 369 | Adapter->PackInfo[iIndex].LastTxQueue); |
@@ -404,7 +403,7 @@ VOID flush_all_queues(PMINI_ADAPTER Adapter) | |||
404 | // down(&Adapter->data_packet_queue_lock); | 403 | // down(&Adapter->data_packet_queue_lock); |
405 | for(iQIndex=LowPriority; iQIndex<HiPriority; iQIndex++) | 404 | for(iQIndex=LowPriority; iQIndex<HiPriority; iQIndex++) |
406 | { | 405 | { |
407 | struct netdev_queue *txq = netdev_get_tx_queue(Adapter->dev, iQIndex); | 406 | struct net_device_stats *netstats = &Adapter->dev->stats; |
408 | 407 | ||
409 | spin_lock_bh(&Adapter->PackInfo[iQIndex].SFQueueLock); | 408 | spin_lock_bh(&Adapter->PackInfo[iQIndex].SFQueueLock); |
410 | while(Adapter->PackInfo[iQIndex].FirstTxQueue) | 409 | while(Adapter->PackInfo[iQIndex].FirstTxQueue) |
@@ -413,7 +412,7 @@ VOID flush_all_queues(PMINI_ADAPTER Adapter) | |||
413 | if(PacketToDrop) | 412 | if(PacketToDrop) |
414 | { | 413 | { |
415 | uiTotalPacketLength = PacketToDrop->len; | 414 | uiTotalPacketLength = PacketToDrop->len; |
416 | txq->tx_dropped++; | 415 | netstats->tx_dropped++; |
417 | } | 416 | } |
418 | else | 417 | else |
419 | uiTotalPacketLength = 0; | 418 | uiTotalPacketLength = 0; |
diff --git a/drivers/staging/bcm/Transmit.c b/drivers/staging/bcm/Transmit.c index 0f7000960d50..d5e4a7404f71 100644 --- a/drivers/staging/bcm/Transmit.c +++ b/drivers/staging/bcm/Transmit.c | |||
@@ -157,11 +157,11 @@ INT SetupNextSend(PMINI_ADAPTER Adapter, struct sk_buff *Packet, USHORT Vcid) | |||
157 | } | 157 | } |
158 | else | 158 | else |
159 | { | 159 | { |
160 | struct netdev_queue *txq = netdev_get_tx_queue(Adapter->dev, QueueIndex); | 160 | struct net_device_stats *netstats = &Adapter->dev->stats; |
161 | Adapter->PackInfo[QueueIndex].uiTotalTxBytes += Leader.PLength; | 161 | Adapter->PackInfo[QueueIndex].uiTotalTxBytes += Leader.PLength; |
162 | 162 | ||
163 | txq->tx_bytes += Leader.PLength; | 163 | netstats->tx_bytes += Leader.PLength; |
164 | ++txq->tx_packets; | 164 | ++netstats->tx_packets; |
165 | 165 | ||
166 | Adapter->PackInfo[QueueIndex].uiCurrentTokenCount -= Leader.PLength << 3; | 166 | Adapter->PackInfo[QueueIndex].uiCurrentTokenCount -= Leader.PLength << 3; |
167 | Adapter->PackInfo[QueueIndex].uiSentBytes += (Packet->len); | 167 | Adapter->PackInfo[QueueIndex].uiSentBytes += (Packet->len); |