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;