From b4eeed9c958c234090632698eefce64394102a2b Mon Sep 17 00:00:00 2001
From: Jon Mason <jdmason@kudzu.us>
Date: Mon, 9 Jul 2012 14:09:25 +0000
Subject: [PATCH] --- yaml --- r: 315089 b: refs/heads/master c:
 5c8b73ca43dc6f419e02597d9942222b7987e74c h: refs/heads/master i:   315087:
 298a03ce4da7963a72bb7b5fcfa4a4e57a2574c0 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/net/ethernet/amd/lance.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 167ac7351f61..4f7384e78f3a 100644
--- 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
index a6e2e840884e..5c728436b85e 100644
--- 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;