diff options
| author | Linus Torvalds | 2007-10-26 00:44:54 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2007-10-26 00:44:54 +0200 |
| commit | 7f1495745347bc2cb9cc4f50d0a889caeb71f1f1 (patch) | |
| tree | 2402b7e52fec57cdbf16d52e5fb467044589ec31 /drivers/net | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest (diff) | |
| parent | fix sg_phys to use dma_addr_t (diff) | |
| download | kernel-qcow2-linux-7f1495745347bc2cb9cc4f50d0a889caeb71f1f1.tar.gz kernel-qcow2-linux-7f1495745347bc2cb9cc4f50d0a889caeb71f1f1.tar.xz kernel-qcow2-linux-7f1495745347bc2cb9cc4f50d0a889caeb71f1f1.zip | |
Merge branch 'sg' of git://git.kernel.dk/linux-2.6-block
* 'sg' of git://git.kernel.dk/linux-2.6-block:
fix sg_phys to use dma_addr_t
ub: add sg_init_table for sense and read capacity commands
x86: pci-gart fix
blackfin: fix sg fallout
xtensa: dma-mapping.h is using linux/scatterlist.h functions, so include it
SG: audit of drivers that use blk_rq_map_sg()
arch/um/drivers/ubd_kern.c: fix a building error
SG: Change sg_set_page() to take length and offset argument
AVR32: Fix sg_page breakage
mmc: sg fallout
m68k: sg fallout
More SG build fixes
sg: add missing sg_init_table calls to zfcp
SG build fix
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/mlx4/icm.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/mlx4/icm.c b/drivers/net/mlx4/icm.c index 887633b207d9..2a5bef6388fe 100644 --- a/drivers/net/mlx4/icm.c +++ b/drivers/net/mlx4/icm.c @@ -101,9 +101,7 @@ static int mlx4_alloc_icm_pages(struct scatterlist *mem, int order, gfp_t gfp_ma if (!page) return -ENOMEM; - sg_set_page(mem, page); - mem->length = PAGE_SIZE << order; - mem->offset = 0; + sg_set_page(mem, page, PAGE_SIZE << order, 0); return 0; } |