From 78f1d1bbf4c910bd664e781f6f957f4a1ff1fa9b Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Thu, 31 Aug 2006 14:27:49 -0700 Subject: [PATCH] --- yaml --- r: 35210 b: refs/heads/master c: 859b039463d7584afb4e25e950bf6dd58460add8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/e100.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 35bf10e78d31..e5596162c5dc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b1d26f24e864204dfaa82b1252477e981ba9ef24 +refs/heads/master: 859b039463d7584afb4e25e950bf6dd58460add8 diff --git a/trunk/drivers/net/e100.c b/trunk/drivers/net/e100.c index e12cc68deaa4..356661a13c3e 100644 --- a/trunk/drivers/net/e100.c +++ b/trunk/drivers/net/e100.c @@ -1763,7 +1763,6 @@ static int e100_rx_alloc_skb(struct nic *nic, struct rx *rx) return -ENOMEM; /* Align, init, and map the RFD. */ - rx->skb->dev = nic->netdev; skb_reserve(rx->skb, NET_IP_ALIGN); memcpy(rx->skb->data, &nic->blank_rfd, sizeof(struct rfd)); rx->dma_addr = pci_map_single(nic->pdev, rx->skb->data,