---

yaml --- r: 315089 b: refs/heads/master c: 5c8b73c h: refs/heads/master i: 315087: 298a03c v: v3
git-mirror · Jul 11, 2012 · b4eeed9 · b4eeed9
1 parent ea02cd6
commit b4eeed9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0589fa78ae534acb741370872c4e13578d2f164
+refs/heads/master: 5c8b73ca43dc6f419e02597d9942222b7987e74c
diff --git a/trunk/drivers/net/ethernet/amd/lance.c b/trunk/drivers/net/ethernet/amd/lance.c
@@ -873,10 +873,9 @@ lance_init_ring(struct net_device *dev, gfp_t gfp)
 
 		skb = alloc_skb(PKT_BUF_SZ, GFP_DMA | gfp);
 		lp->rx_skbuff[i] = skb;
-		if (skb) {
-			skb->dev = dev;
+		if (skb)
 			rx_buff = skb->data;
-		} else
+		else
 			rx_buff = kmalloc(PKT_BUF_SZ, GFP_DMA | gfp);
 		if (rx_buff == NULL)
 			lp->rx_ring[i].base = 0;