Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1674 commits)
  qlcnic: adding co maintainer
  ixgbe: add support for active DA cables
  ixgbe: dcb, do not tag tc_prio_control frames
  ixgbe: fix ixgbe_tx_is_paused logic
  ixgbe: always enable vlan strip/insert when DCB is enabled
  ixgbe: remove some redundant code in setting FCoE FIP filter
  ixgbe: fix wrong offset to fc_frame_header in ixgbe_fcoe_ddp
  ixgbe: fix header len when unsplit packet overflows to data buffer
  ipv6: Never schedule DAD timer on dead address
  ipv6: Use POSTDAD state
  ipv6: Use state_lock to protect ifa state
  ipv6: Replace inet6_ifaddr->dead with state
  cxgb4: notify upper drivers if the device is already up when they load
  cxgb4: keep interrupts available when the ports are brought down
  cxgb4: fix initial addition of MAC address
  cnic: Return SPQ credit to bnx2x after ring setup and shutdown.
  cnic: Convert cnic_local_flags to atomic ops.
  can: Fix SJA1000 command register writes on SMP systems
  bridge: fix build for CONFIG_SYSFS disabled
  ARCNET: Limit com20020 PCI ID matches for SOHARD cards
  ...

Fix up various conflicts with pcmcia tree drivers/net/
{pcmcia/3c589_cs.c, wireless/orinoco/orinoco_cs.c and
wireless/orinoco/spectrum_cs.c} and feature removal
(Documentation/feature-removal-schedule.txt).

Also fix a non-content conflict due to pm_qos_requirement getting
renamed in the PM tree (now pm_qos_request) in net/mac80211/scan.c

1 files changed, 19 insertions, 25 deletions

diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c
index 97a3dfd94dfa..b9a591604e5b 100644
--- a/drivers/net/acenic.c
+++ b/drivers/net/acenic.c
@@ -661,7 +661,7 @@ static void __devexit acenic_remove_one(struct pci_dev *pdev)
                         dma_addr_t mapping;
 
                         ringp = &ap->skb->rx_std_skbuff[i];
-                        mapping = pci_unmap_addr(ringp, mapping);
+                        mapping = dma_unmap_addr(ringp, mapping);
                         pci_unmap_page(ap->pdev, mapping,
                                        ACE_STD_BUFSIZE,
                                        PCI_DMA_FROMDEVICE);
@@ -681,7 +681,7 @@ static void __devexit acenic_remove_one(struct pci_dev *pdev)
                                 dma_addr_t mapping;
 
                                 ringp = &ap->skb->rx_mini_skbuff[i];
-                                mapping = pci_unmap_addr(ringp,mapping);
+                                mapping = dma_unmap_addr(ringp,mapping);
                                 pci_unmap_page(ap->pdev, mapping,
                                                ACE_MINI_BUFSIZE,
                                                PCI_DMA_FROMDEVICE);
@@ -700,7 +700,7 @@ static void __devexit acenic_remove_one(struct pci_dev *pdev)
                         dma_addr_t mapping;
 
                         ringp = &ap->skb->rx_jumbo_skbuff[i];
-                        mapping = pci_unmap_addr(ringp, mapping);
+                        mapping = dma_unmap_addr(ringp, mapping);
                         pci_unmap_page(ap->pdev, mapping,
                                        ACE_JUMBO_BUFSIZE,
                                        PCI_DMA_FROMDEVICE);
@@ -1683,7 +1683,7 @@ static void ace_load_std_rx_ring(struct ace_private *ap, int nr_bufs)
                                        ACE_STD_BUFSIZE,
                                        PCI_DMA_FROMDEVICE);
                 ap->skb->rx_std_skbuff[idx].skb = skb;
-                pci_unmap_addr_set(&ap->skb->rx_std_skbuff[idx],
+                dma_unmap_addr_set(&ap->skb->rx_std_skbuff[idx],
                                    mapping, mapping);
 
                 rd = &ap->rx_std_ring[idx];
@@ -1744,7 +1744,7 @@ static void ace_load_mini_rx_ring(struct ace_private *ap, int nr_bufs)
                                        ACE_MINI_BUFSIZE,
                                        PCI_DMA_FROMDEVICE);
                 ap->skb->rx_mini_skbuff[idx].skb = skb;
-                pci_unmap_addr_set(&ap->skb->rx_mini_skbuff[idx],
+                dma_unmap_addr_set(&ap->skb->rx_mini_skbuff[idx],
                                    mapping, mapping);
 
                 rd = &ap->rx_mini_ring[idx];
@@ -1800,7 +1800,7 @@ static void ace_load_jumbo_rx_ring(struct ace_private *ap, int nr_bufs)
                                        ACE_JUMBO_BUFSIZE,
                                        PCI_DMA_FROMDEVICE);
                 ap->skb->rx_jumbo_skbuff[idx].skb = skb;
-                pci_unmap_addr_set(&ap->skb->rx_jumbo_skbuff[idx],
+                dma_unmap_addr_set(&ap->skb->rx_jumbo_skbuff[idx],
                                    mapping, mapping);
 
                 rd = &ap->rx_jumbo_ring[idx];
@@ -2013,7 +2013,7 @@ static void ace_rx_int(struct net_device *dev, u32 rxretprd, u32 rxretcsm)
                 skb = rip->skb;
                 rip->skb = NULL;
                 pci_unmap_page(ap->pdev,
-                               pci_unmap_addr(rip, mapping),
+                               dma_unmap_addr(rip, mapping),
                                mapsize,
                                PCI_DMA_FROMDEVICE);
                 skb_put(skb, retdesc->size);
@@ -2078,18 +2078,16 @@ static inline void ace_tx_int(struct net_device *dev,
 
         do {
                 struct sk_buff *skb;
-                dma_addr_t mapping;
                 struct tx_ring_info *info;
 
                 info = ap->skb->tx_skbuff + idx;
                 skb = info->skb;
-                mapping = pci_unmap_addr(info, mapping);
 
-                if (mapping) {
-                        pci_unmap_page(ap->pdev, mapping,
-                                       pci_unmap_len(info, maplen),
+                if (dma_unmap_len(info, maplen)) {
+                        pci_unmap_page(ap->pdev, dma_unmap_addr(info, mapping),
+                                       dma_unmap_len(info, maplen),
                                        PCI_DMA_TODEVICE);
-                        pci_unmap_addr_set(info, mapping, 0);
+                        dma_unmap_len_set(info, maplen, 0);
                 }
 
                 if (skb) {
@@ -2377,14 +2375,12 @@ static int ace_close(struct net_device *dev)
 
         for (i = 0; i < ACE_TX_RING_ENTRIES(ap); i++) {
                 struct sk_buff *skb;
-                dma_addr_t mapping;
                 struct tx_ring_info *info;
 
                 info = ap->skb->tx_skbuff + i;
                 skb = info->skb;
-                mapping = pci_unmap_addr(info, mapping);
 
-                if (mapping) {
+                if (dma_unmap_len(info, maplen)) {
                         if (ACE_IS_TIGON_I(ap)) {
                                 /* NB: TIGON_1 is special, tx_ring is in io space */
                                 struct tx_desc __iomem *tx;
@@ -2395,10 +2391,10 @@ static int ace_close(struct net_device *dev)
                         } else
                                 memset(ap->tx_ring + i, 0,
                                        sizeof(struct tx_desc));
-                        pci_unmap_page(ap->pdev, mapping,
-                                       pci_unmap_len(info, maplen),
+                        pci_unmap_page(ap->pdev, dma_unmap_addr(info, mapping),
+                                       dma_unmap_len(info, maplen),
                                        PCI_DMA_TODEVICE);
-                        pci_unmap_addr_set(info, mapping, 0);
+                        dma_unmap_len_set(info, maplen, 0);
                 }
                 if (skb) {
                         dev_kfree_skb(skb);
@@ -2433,8 +2429,8 @@ ace_map_tx_skb(struct ace_private *ap, struct sk_buff *skb,
 
         info = ap->skb->tx_skbuff + idx;
         info->skb = tail;
-        pci_unmap_addr_set(info, mapping, mapping);
-        pci_unmap_len_set(info, maplen, skb->len);
+        dma_unmap_addr_set(info, mapping, mapping);
+        dma_unmap_len_set(info, maplen, skb->len);
         return mapping;
 }
 
@@ -2553,8 +2549,8 @@ restart:
                         } else {
                                 info->skb = NULL;
                         }
-                        pci_unmap_addr_set(info, mapping, mapping);
-                        pci_unmap_len_set(info, maplen, frag->size);
+                        dma_unmap_addr_set(info, mapping, mapping);
+                        dma_unmap_len_set(info, maplen, frag->size);
                         ace_load_tx_bd(ap, desc, mapping, flagsize, vlan_tag);
                 }
         }
@@ -2923,8 +2919,6 @@ static void __devinit ace_clear(struct ace_regs __iomem *regs, u32 dest, int siz
                 dest += tsize;
                 size -= tsize;
         }
-
-        return;
 }