---

yaml --- r: 232832 b: refs/heads/master c: 9eb7107 h: refs/heads/master v: v3
git-mirror · Jan 27, 2011 · 7f4bf75 · 7f4bf75
1 parent bfcff1b
commit 7f4bf75
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0ce4af920eb028f38bfd680b1d733f4c7a0b7cf
+refs/heads/master: 9eb710797a21fa4a9e09ae9c86c4b3ec9d291c2d
diff --git a/trunk/drivers/net/dl2k.c b/trunk/drivers/net/dl2k.c
@@ -1753,8 +1753,6 @@ rio_close (struct net_device *dev)
 
 	/* Free all the skbuffs in the queue. */
 	for (i = 0; i < RX_RING_SIZE; i++) {
-		np->rx_ring[i].status = 0;
-		np->rx_ring[i].fraginfo = 0;
 		skb = np->rx_skbuff[i];
 		if (skb) {
 			pci_unmap_single(np->pdev,
@@ -1763,6 +1761,8 @@ rio_close (struct net_device *dev)
 			dev_kfree_skb (skb);
 			np->rx_skbuff[i] = NULL;
 		}
+		np->rx_ring[i].status = 0;
+		np->rx_ring[i].fraginfo = 0;
 	}
 	for (i = 0; i < TX_RING_SIZE; i++) {
 		skb = np->tx_skbuff[i];