AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-03-22 06:50:30 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Staging: bcm: Qos.c: Replaced member accessing with variable in PruneQueue()

Browse Source 
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Matthias Beyer 2014-07-29 16:52:16 +02:00 committed by Greg Kroah-Hartman
parent 6ff4d01016
commit a3a741c651
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/staging/bcm/Qos.c
View File

@ -318,6 +318,7 @@ static VOID PruneQueue(struct bcm_mini_adapter *Adapter, INT iIndex)
{ {
struct sk_buff *PacketToDrop = NULL; struct sk_buff *PacketToDrop = NULL;
struct net_device_stats *netstats; struct net_device_stats *netstats;
struct bcm_packet_info *curr_pack_info = &Adapter->PackInfo[iIndex];
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, PRUNE_QUEUE, DBG_LVL_ALL, "=====> Index %d", iIndex); BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, PRUNE_QUEUE, DBG_LVL_ALL, "=====> Index %d", iIndex);
@ -330,22 +331,22 @@ static VOID PruneQueue(struct bcm_mini_adapter *Adapter, INT iIndex)
/* To Store the netdevice statistic */ /* To Store the netdevice statistic */
netstats = &Adapter->dev->stats; netstats = &Adapter->dev->stats;
spin_lock_bh(&Adapter->PackInfo[iIndex].SFQueueLock); spin_lock_bh(&curr_pack_info->SFQueueLock);
while (1) { while (1) {
/* while((UINT)Adapter->PackInfo[iIndex].uiCurrentPacketsOnHost > */ /* while((UINT)Adapter->PackInfo[iIndex].uiCurrentPacketsOnHost > */
/* SF_MAX_ALLOWED_PACKETS_TO_BACKUP) { */ /* SF_MAX_ALLOWED_PACKETS_TO_BACKUP) { */
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, PRUNE_QUEUE, DBG_LVL_ALL, "uiCurrentBytesOnHost:%x uiMaxBucketSize :%x", BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, PRUNE_QUEUE, DBG_LVL_ALL, "uiCurrentBytesOnHost:%x uiMaxBucketSize :%x",
Adapter->PackInfo[iIndex].uiCurrentBytesOnHost, curr_pack_info->uiCurrentBytesOnHost,
Adapter->PackInfo[iIndex].uiMaxBucketSize); curr_pack_info->uiMaxBucketSize);
PacketToDrop = Adapter->PackInfo[iIndex].FirstTxQueue; PacketToDrop = curr_pack_info->FirstTxQueue;
if (PacketToDrop == NULL) if (PacketToDrop == NULL)
break; break;
if ((Adapter->PackInfo[iIndex].uiCurrentPacketsOnHost < SF_MAX_ALLOWED_PACKETS_TO_BACKUP) && if ((curr_pack_info->uiCurrentPacketsOnHost < SF_MAX_ALLOWED_PACKETS_TO_BACKUP) &&
((1000*(jiffies - *((B_UINT32 *)(PacketToDrop->cb)+SKB_CB_LATENCY_OFFSET))/HZ) <= Adapter->PackInfo[iIndex].uiMaxLatency)) ((1000*(jiffies - *((B_UINT32 *)(PacketToDrop->cb)+SKB_CB_LATENCY_OFFSET))/HZ) <= curr_pack_info->uiMaxLatency))
break; break;
if (PacketToDrop) { if (PacketToDrop) {
@ -355,27 +356,27 @@ static VOID PruneQueue(struct bcm_mini_adapter *Adapter, INT iIndex)
netstats->tx_dropped++; netstats->tx_dropped++;
DEQUEUEPACKET(Adapter->PackInfo[iIndex].FirstTxQueue, DEQUEUEPACKET(curr_pack_info->FirstTxQueue,
Adapter->PackInfo[iIndex].LastTxQueue); curr_pack_info->LastTxQueue);
/* update current bytes and packets count */ /* update current bytes and packets count */
Adapter->PackInfo[iIndex].uiCurrentBytesOnHost -= curr_pack_info->uiCurrentBytesOnHost -=
PacketToDrop->len; PacketToDrop->len;
Adapter->PackInfo[iIndex].uiCurrentPacketsOnHost--; curr_pack_info->uiCurrentPacketsOnHost--;
/* update dropped bytes and packets counts */ /* update dropped bytes and packets counts */
Adapter->PackInfo[iIndex].uiDroppedCountBytes += PacketToDrop->len; curr_pack_info->uiDroppedCountBytes += PacketToDrop->len;
Adapter->PackInfo[iIndex].uiDroppedCountPackets++; curr_pack_info->uiDroppedCountPackets++;
dev_kfree_skb(PacketToDrop); dev_kfree_skb(PacketToDrop);
} }
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, PRUNE_QUEUE, DBG_LVL_ALL, "Dropped Bytes:%x Dropped Packets:%x", BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, PRUNE_QUEUE, DBG_LVL_ALL, "Dropped Bytes:%x Dropped Packets:%x",
Adapter->PackInfo[iIndex].uiDroppedCountBytes, curr_pack_info->uiDroppedCountBytes,
Adapter->PackInfo[iIndex].uiDroppedCountPackets); curr_pack_info->uiDroppedCountPackets);
atomic_dec(&Adapter->TotalPacketCount); atomic_dec(&Adapter->TotalPacketCount);
} }
spin_unlock_bh(&Adapter->PackInfo[iIndex].SFQueueLock); spin_unlock_bh(&curr_pack_info->SFQueueLock);
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, PRUNE_QUEUE, DBG_LVL_ALL, "TotalPacketCount:%x", BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, PRUNE_QUEUE, DBG_LVL_ALL, "TotalPacketCount:%x",
atomic_read(&Adapter->TotalPacketCount)); atomic_read(&Adapter->TotalPacketCount));