diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-06-30 00:49:18 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-30 00:49:18 -0400 |
| commit | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (patch) | |
| tree | c40fd8818c64c5d7d1d90afab0bd6ffd94505526 /drivers/net/lance.c | |
| parent | 9bd481f85940726bf66aae5cd03c5b912ad0ae4c (diff) | |
| parent | 9b4311eedb17fa88f02e4876cd6aa9a08e383cd6 (diff) | |
Merge upstream 2.6.13-rc1-git1 into 'ieee80211' branch of netdev-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) |