diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 18:06:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 18:06:16 -0800 |
| commit | 8b11a705bdc5fd9f39b113f7d1dc9c8eeabe301b (patch) | |
| tree | f00c6c3accce342c055af338eaa88583e5fe3552 /drivers/net/tokenring | |
| parent | 90a880a460aeb2374d6c766c08fa7786fb982aae (diff) | |
v2.4.2.7 -> v2.4.2.8
- Paul Mackerras: PPC update for thread-safe page table handling
- Ingo Molnar: x86 PAE update for thread-safe page table handling
- Jeff Garzik: network driver updates, i810 rng driver, and
"alloc_etherdev()" network driver insert race condition fix.
- David Miller: UltraSparcIII update, network locking fixes
- Al Viro: fix fs counts on mount failure
Diffstat (limited to 'drivers/net/tokenring')
| -rw-r--r-- | drivers/net/tokenring/tms380tr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/tokenring/tms380tr.c b/drivers/net/tokenring/tms380tr.c index 6cc5f2c24d40..fe03c8338dec 100644 --- a/drivers/net/tokenring/tms380tr.c +++ b/drivers/net/tokenring/tms380tr.c @@ -2192,11 +2192,11 @@ static void tms380tr_rcv_status_irq(struct net_device *dev) } } - if(rpl->SkbStat == SKB_DATA_COPY - || rpl->SkbStat == SKB_DMA_DIRECT) + if(skb && (rpl->SkbStat == SKB_DATA_COPY + || rpl->SkbStat == SKB_DMA_DIRECT)) { if(rpl->SkbStat == SKB_DATA_COPY) - memmove(skb->data, ReceiveDataPtr, Length); + memcpy(skb->data, ReceiveDataPtr, Length); /* Deliver frame to system */ rpl->Skb = NULL; |