diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-29 18:21:41 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-29 18:21:41 -0400 |
| commit | d18bfacff20f08aecf01bb971b110ca108eef3c7 (patch) | |
| tree | 255f862839c593c796e609328575b611e3f56cf3 /drivers/net/lance.c | |
| parent | a68db763af9b676590c3fe9ec3f17bf18015eb2f (diff) | |
| parent | fd782a4a99d2d3e818b9465c427b10f7f027d7da (diff) | |
Auto merge with /home/aegl/GIT/linus
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) |