diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-05 08:33:31 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-05 08:33:31 -0500 |
| commit | 43769f10b4826376cbf4ce17af74a5b4e8dc4fcd (patch) | |
| tree | 8a7f36985f9ef8e6771163c751eeefd22ee71693 /drivers/net/tulip/de2104x.c | |
| parent | ae7462b4f1fe1f36b5d562dbd5202a2eba01f072 (diff) | |
| parent | eda58a85ec3fc05855a26654d97a2b53f0e715b9 (diff) | |
Merge branches 'tracing/ftrace' and 'linus' into tracing/core
Diffstat (limited to 'drivers/net/tulip/de2104x.c')
| -rw-r--r-- | drivers/net/tulip/de2104x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c index d5d53b633cf8..0bf2114738be 100644 --- a/drivers/net/tulip/de2104x.c +++ b/drivers/net/tulip/de2104x.c | |||
| @@ -392,7 +392,7 @@ static void de_rx (struct de_private *de) | |||
| 392 | unsigned drop = 0; | 392 | unsigned drop = 0; |
| 393 | int rc; | 393 | int rc; |
| 394 | 394 | ||
| 395 | while (rx_work--) { | 395 | while (--rx_work) { |
| 396 | u32 status, len; | 396 | u32 status, len; |
| 397 | dma_addr_t mapping; | 397 | dma_addr_t mapping; |
| 398 | struct sk_buff *skb, *copy_skb; | 398 | struct sk_buff *skb, *copy_skb; |