diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-19 01:19:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-19 01:19:03 -0500 |
| commit | 3505d1a9fd65e2d3e00827857b6795d9d8983658 (patch) | |
| tree | 941cfafdb57c427bb6b7ebf6354ee93b2a3693b5 /drivers/net/cxgb3 | |
| parent | dfef948ed2ba69cf041840b5e860d6b4e16fa0b1 (diff) | |
| parent | 66b00a7c93ec782d118d2c03bd599cfd041e80a1 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/sfc/sfe4001.c
drivers/net/wireless/libertas/cmd.c
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/rtl8187se/Kconfig
drivers/staging/rtl8192e/Kconfig
Diffstat (limited to 'drivers/net/cxgb3')
| -rw-r--r-- | drivers/net/cxgb3/sge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c index cf2e1d3c0d8d..49f3de79118c 100644 --- a/drivers/net/cxgb3/sge.c +++ b/drivers/net/cxgb3/sge.c | |||
| @@ -879,7 +879,7 @@ recycle: | |||
| 879 | pci_dma_sync_single_for_cpu(adap->pdev, dma_addr, len, | 879 | pci_dma_sync_single_for_cpu(adap->pdev, dma_addr, len, |
| 880 | PCI_DMA_FROMDEVICE); | 880 | PCI_DMA_FROMDEVICE); |
| 881 | (*sd->pg_chunk.p_cnt)--; | 881 | (*sd->pg_chunk.p_cnt)--; |
| 882 | if (!*sd->pg_chunk.p_cnt) | 882 | if (!*sd->pg_chunk.p_cnt && sd->pg_chunk.page != fl->pg_chunk.page) |
| 883 | pci_unmap_page(adap->pdev, | 883 | pci_unmap_page(adap->pdev, |
| 884 | sd->pg_chunk.mapping, | 884 | sd->pg_chunk.mapping, |
| 885 | fl->alloc_size, | 885 | fl->alloc_size, |
| @@ -2098,7 +2098,7 @@ static void lro_add_page(struct adapter *adap, struct sge_qset *qs, | |||
| 2098 | PCI_DMA_FROMDEVICE); | 2098 | PCI_DMA_FROMDEVICE); |
| 2099 | 2099 | ||
| 2100 | (*sd->pg_chunk.p_cnt)--; | 2100 | (*sd->pg_chunk.p_cnt)--; |
| 2101 | if (!*sd->pg_chunk.p_cnt) | 2101 | if (!*sd->pg_chunk.p_cnt && sd->pg_chunk.page != fl->pg_chunk.page) |
| 2102 | pci_unmap_page(adap->pdev, | 2102 | pci_unmap_page(adap->pdev, |
| 2103 | sd->pg_chunk.mapping, | 2103 | sd->pg_chunk.mapping, |
| 2104 | fl->alloc_size, | 2104 | fl->alloc_size, |