Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [IPv6]: Invalid semicolon after if statement
  [NET]: Fix unbalanced rcu_read_unlock in __sock_create
  [VLAN] net/8021q/vlanproc.c: fix check-after-use
  [NET]: Unexport dev_ethtool
  [IOAT]: Remove redundant struct member to avoid descriptor cache miss
  [ECONET]: remove econet_packet_type on unload
  [AX25]: don't free pointers to statically allocated data
  [PATCH] mac80211: probe for hidden SSIDs in pre-auth scan
  [PATCH] mac80211: fix tx status frame code
  [BRIDGE]: Fix typo in net/bridge/br_stp_if.c
  [BRIDGE]: sysfs locking fix.
  [NETFILTER]: nf_nat_sip: don't drop short packets
  [NETFILTER]: nf_conntrack_sip: fix SIP-URI parsing
  [NETFILTER]: nf_conntrack_sip: check sname != NULL before calling strncmp
  [NETFILTER]: netfilter: xt_u32 bug correction

2 files changed, 4 insertions, 6 deletions

diff --git a/drivers/dma/ioatdma.c b/drivers/dma/ioatdma.c
index 5fbe56b5cea0..2d1f17865b64 100644
--- a/drivers/dma/ioatdma.c
+++ b/drivers/dma/ioatdma.c
@@ -347,8 +347,7 @@ ioat_dma_prep_memcpy(struct dma_chan *chan, size_t len, int int_en)
         new->async_tx.ack = 0; /* client is in control of this ack */
         new->async_tx.cookie = -EBUSY;
 
-        pci_unmap_len_set(new, src_len, orig_len);
-        pci_unmap_len_set(new, dst_len, orig_len);
+        pci_unmap_len_set(new, len, orig_len);
         spin_unlock_bh(&ioat_chan->desc_lock);
 
         return new ? &new->async_tx : NULL;
@@ -423,11 +422,11 @@ static void ioat_dma_memcpy_cleanup(struct ioat_dma_chan *chan)
                         */
                         pci_unmap_page(chan->device->pdev,
                                         pci_unmap_addr(desc, dst),
-                                        pci_unmap_len(desc, dst_len),
+                                        pci_unmap_len(desc, len),
                                         PCI_DMA_FROMDEVICE);
                         pci_unmap_page(chan->device->pdev,
                                         pci_unmap_addr(desc, src),
-                                        pci_unmap_len(desc, src_len),
+                                        pci_unmap_len(desc, len),
                                         PCI_DMA_TODEVICE);
                 }
 
diff --git a/drivers/dma/ioatdma.h b/drivers/dma/ioatdma.h
index d3726478031a..bf4dad70e0f5 100644
--- a/drivers/dma/ioatdma.h
+++ b/drivers/dma/ioatdma.h
@@ -111,10 +111,9 @@ struct ioat_desc_sw {
         struct ioat_dma_descriptor *hw;
         struct list_head node;
         int tx_cnt;
+        DECLARE_PCI_UNMAP_LEN(len)
         DECLARE_PCI_UNMAP_ADDR(src)
-        DECLARE_PCI_UNMAP_LEN(src_len)
         DECLARE_PCI_UNMAP_ADDR(dst)
-        DECLARE_PCI_UNMAP_LEN(dst_len)
         struct dma_async_tx_descriptor async_tx;
 };