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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  dsa: fix master interface allmulti/promisc handling
  dsa: fix skb->pkt_type when mac address of slave interface differs
  net: fix setting of skb->tail in skb_recycle_check()
  net: fix /proc/net/snmp as memory corruptor
  mac80211: fix a buffer overrun in station debug code
  netfilter: payload_len is be16, add size of struct rather than size of pointer
  ipv6: fix ip6_mr_init error path
  [4/4] dca: fixup initialization dependency
  [3/4] I/OAT: fix async_tx.callback checking
  [2/4] I/OAT: fix dma_pin_iovec_pages() error handling
  [1/4] I/OAT: fix channel resources free for not allocated channels
  ssb: Fix DMA-API compilation for non-PCI systems
  SSB: hide empty sub menu
  vlan: Fix typos in proc output string
  [netdrvr] usb/hso: Cleanup rfkill error handling
  sfc: Correct address of gPXE boot configuration in EEPROM
  el3_common_init() should be __devinit, not __init
  hso: rfkill type should be WWAN
  mlx4_en: Start port error flow bug fix
  af_key: mark policy as dead before destroying

1 files changed, 35 insertions, 7 deletions

diff --git a/include/linux/ssb/ssb.h b/include/linux/ssb/ssb.h
index e530026eedf7..17d9b58f6379 100644
--- a/include/linux/ssb/ssb.h
+++ b/include/linux/ssb/ssb.h
@@ -427,12 +427,16 @@ static inline int ssb_dma_mapping_error(struct ssb_device *dev, dma_addr_t addr)
 {
         switch (dev->bus->bustype) {
         case SSB_BUSTYPE_PCI:
+#ifdef CONFIG_SSB_PCIHOST
                 return pci_dma_mapping_error(dev->bus->host_pci, addr);
+#endif
+                break;
         case SSB_BUSTYPE_SSB:
                 return dma_mapping_error(dev->dev, addr);
         default:
-                __ssb_dma_not_implemented(dev);
+                break;
         }
+        __ssb_dma_not_implemented(dev);
         return -ENOSYS;
 }
 
@@ -441,12 +445,16 @@ static inline dma_addr_t ssb_dma_map_single(struct ssb_device *dev, void *p,
 {
         switch (dev->bus->bustype) {
         case SSB_BUSTYPE_PCI:
+#ifdef CONFIG_SSB_PCIHOST
                 return pci_map_single(dev->bus->host_pci, p, size, dir);
+#endif
+                break;
         case SSB_BUSTYPE_SSB:
                 return dma_map_single(dev->dev, p, size, dir);
         default:
-                __ssb_dma_not_implemented(dev);
+                break;
         }
+        __ssb_dma_not_implemented(dev);
         return 0;
 }
 
@@ -455,14 +463,18 @@ static inline void ssb_dma_unmap_single(struct ssb_device *dev, dma_addr_t dma_a
 {
         switch (dev->bus->bustype) {
         case SSB_BUSTYPE_PCI:
+#ifdef CONFIG_SSB_PCIHOST
                 pci_unmap_single(dev->bus->host_pci, dma_addr, size, dir);
                 return;
+#endif
+                break;
         case SSB_BUSTYPE_SSB:
                 dma_unmap_single(dev->dev, dma_addr, size, dir);
                 return;
         default:
-                __ssb_dma_not_implemented(dev);
+                break;
         }
+        __ssb_dma_not_implemented(dev);
 }
 
 static inline void ssb_dma_sync_single_for_cpu(struct ssb_device *dev,
@@ -472,15 +484,19 @@ static inline void ssb_dma_sync_single_for_cpu(struct ssb_device *dev,
 {
         switch (dev->bus->bustype) {
         case SSB_BUSTYPE_PCI:
+#ifdef CONFIG_SSB_PCIHOST
                 pci_dma_sync_single_for_cpu(dev->bus->host_pci, dma_addr,
                                             size, dir);
                 return;
+#endif
+                break;
         case SSB_BUSTYPE_SSB:
                 dma_sync_single_for_cpu(dev->dev, dma_addr, size, dir);
                 return;
         default:
-                __ssb_dma_not_implemented(dev);
+                break;
         }
+        __ssb_dma_not_implemented(dev);
 }
 
 static inline void ssb_dma_sync_single_for_device(struct ssb_device *dev,
@@ -490,15 +506,19 @@ static inline void ssb_dma_sync_single_for_device(struct ssb_device *dev,
 {
         switch (dev->bus->bustype) {
         case SSB_BUSTYPE_PCI:
+#ifdef CONFIG_SSB_PCIHOST
                 pci_dma_sync_single_for_device(dev->bus->host_pci, dma_addr,
                                                size, dir);
                 return;
+#endif
+                break;
         case SSB_BUSTYPE_SSB:
                 dma_sync_single_for_device(dev->dev, dma_addr, size, dir);
                 return;
         default:
-                __ssb_dma_not_implemented(dev);
+                break;
         }
+        __ssb_dma_not_implemented(dev);
 }
 
 static inline void ssb_dma_sync_single_range_for_cpu(struct ssb_device *dev,
@@ -509,17 +529,21 @@ static inline void ssb_dma_sync_single_range_for_cpu(struct ssb_device *dev,
 {
         switch (dev->bus->bustype) {
         case SSB_BUSTYPE_PCI:
+#ifdef CONFIG_SSB_PCIHOST
                 /* Just sync everything. That's all the PCI API can do. */
                 pci_dma_sync_single_for_cpu(dev->bus->host_pci, dma_addr,
                                             offset + size, dir);
                 return;
+#endif
+                break;
         case SSB_BUSTYPE_SSB:
                 dma_sync_single_range_for_cpu(dev->dev, dma_addr, offset,
                                               size, dir);
                 return;
         default:
-                __ssb_dma_not_implemented(dev);
+                break;
         }
+        __ssb_dma_not_implemented(dev);
 }
 
 static inline void ssb_dma_sync_single_range_for_device(struct ssb_device *dev,
@@ -530,17 +554,21 @@ static inline void ssb_dma_sync_single_range_for_device(struct ssb_device *dev,
 {
         switch (dev->bus->bustype) {
         case SSB_BUSTYPE_PCI:
+#ifdef CONFIG_SSB_PCIHOST
                 /* Just sync everything. That's all the PCI API can do. */
                 pci_dma_sync_single_for_device(dev->bus->host_pci, dma_addr,
                                                offset + size, dir);
                 return;
+#endif
+                break;
         case SSB_BUSTYPE_SSB:
                 dma_sync_single_range_for_device(dev->dev, dma_addr, offset,
                                                  size, dir);
                 return;
         default:
-                __ssb_dma_not_implemented(dev);
+                break;
         }
+        __ssb_dma_not_implemented(dev);
 }