diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2011-07-01 16:17:13 +0200 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2011-07-01 16:17:13 +0200 |
| commit | 04bf7869ca0fd12009aee301cac2264a36df4d98 (patch) | |
| tree | 66cb81ebf8b76560a31433c2c493dc430c914af9 /drivers/net/tg3.c | |
| parent | d2f31a5fd60d168b00fc4f7617b68a1287b21e90 (diff) | |
| parent | 7b28afe01ab6ffb5f152f47831b44933facd2328 (diff) | |
| download | linux-04bf7869ca0fd12009aee301cac2264a36df4d98.tar.gz | |
Merge branch 'for-linus' into for-3.1/core
Conflicts:
block/blk-throttle.c
block/cfq-iosched.c
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'drivers/net/tg3.c')
| -rw-r--r-- | drivers/net/tg3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index f4b01c638a33..a1f9f9eef37d 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -5774,7 +5774,7 @@ static void tg3_skb_error_unmap(struct tg3_napi *tnapi, dma_unmap_addr(txb, mapping), skb_headlen(skb), PCI_DMA_TODEVICE); - for (i = 0; i <= last; i++) { + for (i = 0; i < last; i++) { skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; entry = NEXT_TX(entry); |