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: (46 commits)
  [NET] ifb: set separate lockdep classes for queue locks
  [IPV6] KCONFIG: Fix description about IPV6_TUNNEL.
  [TCP]: Fix shrinking windows with window scaling
  netpoll: zap_completion_queue: adjust skb->users counter
  bridge: use time_before() in br_fdb_cleanup()
  [TG3]: Fix build warning on sparc32.
  MAINTAINERS: bluez-devel is subscribers-only
  audit: netlink socket can be auto-bound to pid other than current->pid (v2)
  [NET]: Fix permissions of /proc/net
  [SCTP]: Fix a race between module load and protosw access
  [NETFILTER]: ipt_recent: sanity check hit count
  [NETFILTER]: nf_conntrack_h323: logical-bitwise & confusion in process_setup()
  [RT2X00] drivers/net/wireless/rt2x00/rt2x00dev.c: remove dead code, fix warning
  [IPV4]: esp_output() misannotations
  [8021Q]: vlan_dev misannotations
  xfrm: ->eth_proto is __be16
  [IPV4]: ipv4_is_lbcast() misannotations
  [SUNRPC]: net/* NULL noise
  [SCTP]: fix misannotated __sctp_rcv_asconf_lookup()
  [PKT_SCHED]: annotate cls_u32
  ...

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c
index 19184e486ae9..169edc154928 100644
--- a/drivers/net/r6040.c
+++ b/drivers/net/r6040.c
@@ -239,7 +239,8 @@ static void r6040_free_txbufs(struct net_device *dev)
 
         for (i = 0; i < TX_DCNT; i++) {
                 if (lp->tx_insert_ptr->skb_ptr) {
-                        pci_unmap_single(lp->pdev, lp->tx_insert_ptr->buf,
+                        pci_unmap_single(lp->pdev,
+                                le32_to_cpu(lp->tx_insert_ptr->buf),
                                 MAX_BUF_SIZE, PCI_DMA_TODEVICE);
                         dev_kfree_skb(lp->tx_insert_ptr->skb_ptr);
                         lp->rx_insert_ptr->skb_ptr = NULL;
@@ -255,7 +256,8 @@ static void r6040_free_rxbufs(struct net_device *dev)
 
         for (i = 0; i < RX_DCNT; i++) {
                 if (lp->rx_insert_ptr->skb_ptr) {
-                        pci_unmap_single(lp->pdev, lp->rx_insert_ptr->buf,
+                        pci_unmap_single(lp->pdev,
+                                le32_to_cpu(lp->rx_insert_ptr->buf),
                                 MAX_BUF_SIZE, PCI_DMA_FROMDEVICE);
                         dev_kfree_skb(lp->rx_insert_ptr->skb_ptr);
                         lp->rx_insert_ptr->skb_ptr = NULL;
@@ -542,7 +544,7 @@ static int r6040_rx(struct net_device *dev, int limit)
                         skb_ptr->dev = priv->dev;
                         /* Do not count the CRC */
                         skb_put(skb_ptr, descptr->len - 4);
-                        pci_unmap_single(priv->pdev, descptr->buf,
+                        pci_unmap_single(priv->pdev, le32_to_cpu(descptr->buf),
                                 MAX_BUF_SIZE, PCI_DMA_FROMDEVICE);
                         skb_ptr->protocol = eth_type_trans(skb_ptr, priv->dev);
                         /* Send to upper layer */
@@ -585,7 +587,7 @@ static void r6040_tx(struct net_device *dev)
                 if (descptr->status & 0x8000)
                         break; /* Not complete */
                 skb_ptr = descptr->skb_ptr;
-                pci_unmap_single(priv->pdev, descptr->buf,
+                pci_unmap_single(priv->pdev, le32_to_cpu(descptr->buf),
                         skb_ptr->len, PCI_DMA_TODEVICE);
                 /* Free buffer */
                 dev_kfree_skb_irq(skb_ptr);