diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-29 00:24:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-29 00:24:32 -0400 |
| commit | a839688362e32f01608838516036697e30618b39 (patch) | |
| tree | a174d93d568ba9735b13bb6ebb5f1a36c8f56308 /drivers/net/lance.c | |
| parent | 2fa938b8a3964c21b23d9d095091e7abc88249c5 (diff) | |
| parent | 12dc2fdd3e6067f5137e4a6d8af0b1a994952f52 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/lance.c')
| -rw-r--r-- | drivers/net/lance.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/lance.c b/drivers/net/lance.c index ca90f0d1e4b0..b4929beb33b2 100644 --- a/drivers/net/lance.c +++ b/drivers/net/lance.c | |||
| @@ -862,7 +862,7 @@ lance_init_ring(struct net_device *dev, int gfp) | |||
| 862 | lp->rx_skbuff[i] = skb; | 862 | lp->rx_skbuff[i] = skb; |
| 863 | if (skb) { | 863 | if (skb) { |
| 864 | skb->dev = dev; | 864 | skb->dev = dev; |
| 865 | rx_buff = skb->tail; | 865 | rx_buff = skb->data; |
| 866 | } else | 866 | } else |
| 867 | rx_buff = kmalloc(PKT_BUF_SZ, GFP_DMA | gfp); | 867 | rx_buff = kmalloc(PKT_BUF_SZ, GFP_DMA | gfp); |
| 868 | if (rx_buff == NULL) | 868 | if (rx_buff == NULL) |