---

yaml --- r: 231782 b: refs/heads/master c: c14cc63 h: refs/heads/master v: v3
git-mirror · Jan 18, 2011 · 9cc6536 · 9cc6536
1 parent a6ee6b9
commit 9cc6536
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6f597a1425b5af64917be3448b29e2d5a585ac8
+refs/heads/master: c14cc63a63e94d490ac6517a555113c30d420db4
diff --git a/trunk/drivers/staging/bcm/Qos.c b/trunk/drivers/staging/bcm/Qos.c
@@ -359,11 +359,12 @@ static VOID PruneQueue(PMINI_ADAPTER Adapter, INT iIndex)
 
 		if(PacketToDrop)
 		{
+			struct netdev_queue *txq = netdev_get_tx_queue(Adapter->dev, iIndex);
 			if (netif_msg_tx_err(Adapter))
 				pr_info(PFX "%s: tx queue %d overlimit\n", 
 					Adapter->dev->name, iIndex);
 
-			netstats->tx_dropped++;
+			txq->tx_dropped++;
 
 			DEQUEUEPACKET(Adapter->PackInfo[iIndex].FirstTxQueue,
 						Adapter->PackInfo[iIndex].LastTxQueue);
@@ -403,7 +404,7 @@ VOID flush_all_queues(PMINI_ADAPTER Adapter)
 //	down(&Adapter->data_packet_queue_lock);
 	for(iQIndex=LowPriority; iQIndex<HiPriority; iQIndex++)
 	{
-		struct net_device_stats *netstats = &Adapter->dev->stats;
+		struct netdev_queue *txq = netdev_get_tx_queue(Adapter->dev, iQIndex);
 
 		spin_lock_bh(&Adapter->PackInfo[iQIndex].SFQueueLock);
 		while(Adapter->PackInfo[iQIndex].FirstTxQueue)
@@ -412,7 +413,7 @@ VOID flush_all_queues(PMINI_ADAPTER Adapter)
 			if(PacketToDrop)
 			{
 				uiTotalPacketLength = PacketToDrop->len;
-				netstats->tx_dropped++;
+				txq->tx_dropped++;
 			}
 			else
 				uiTotalPacketLength = 0;

diff --git a/trunk/drivers/staging/bcm/Transmit.c b/trunk/drivers/staging/bcm/Transmit.c
@@ -157,11 +157,11 @@ INT SetupNextSend(PMINI_ADAPTER Adapter,  struct sk_buff *Packet, USHORT Vcid)
 	}
 	else
 	{
-		struct net_device_stats *netstats = &Adapter->dev->stats;
+		struct netdev_queue *txq = netdev_get_tx_queue(Adapter->dev, QueueIndex);
 		Adapter->PackInfo[QueueIndex].uiTotalTxBytes += Leader.PLength;
 
-		netstats->tx_bytes += Leader.PLength;
-		++netstats->tx_packets;
+		txq->tx_bytes += Leader.PLength;
+		++txq->tx_packets;
 
 		Adapter->PackInfo[QueueIndex].uiCurrentTokenCount -= Leader.PLength << 3;
 		Adapter->PackInfo[QueueIndex].uiSentBytes += (Packet->len);

diff --git a/trunk/fs/autofs4/expire.c b/trunk/fs/autofs4/expire.c
@@ -96,7 +96,7 @@ static struct dentry *get_next_positive_dentry(struct dentry *prev,
 	struct dentry *p, *ret;
 
 	if (prev == NULL)
-		return dget(prev);
+		return dget(root);
 
 	spin_lock(&autofs4_lock);
 relock:
@@ -133,7 +133,7 @@ static struct dentry *get_next_positive_dentry(struct dentry *prev,
 	spin_lock_nested(&ret->d_lock, DENTRY_D_LOCK_NESTED);
 	/* Negative dentry - try next */
 	if (!simple_positive(ret)) {
-		spin_unlock(&ret->d_lock);
+		spin_unlock(&p->d_lock);
 		p = ret;
 		goto again;
 	}