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: (1623 commits)
  netxen: update copyright
  netxen: fix tx timeout recovery
  netxen: fix file firmware leak
  netxen: improve pci memory access
  netxen: change firmware write size
  tg3: Fix return ring size breakage
  netxen: build fix for INET=n
  cdc-phonet: autoconfigure Phonet address
  Phonet: back-end for autoconfigured addresses
  Phonet: fix netlink address dump error handling
  ipv6: Add IFA_F_DADFAILED flag
  net: Add DEVTYPE support for Ethernet based devices
  mv643xx_eth.c: remove unused txq_set_wrr()
  ucc_geth: Fix hangs after switching from full to half duplex
  ucc_geth: Rearrange some code to avoid forward declarations
  phy/marvell: Make non-aneg speed/duplex forcing work for 88E1111 PHYs
  drivers/net/phy: introduce missing kfree
  drivers/net/wan: introduce missing kfree
  net: force bridge module(s) to be GPL
  Subject: [PATCH] appletalk: Fix skb leak when ipddp interface is not loaded
  ...

Fixed up trivial conflicts:

 - arch/x86/include/asm/socket.h

   converted to <asm-generic/socket.h> in the x86 tree.  The generic
   header has the same new #define's, so that works out fine.

 - drivers/net/tun.c

   fix conflict between 89f56d1e9 ("tun: reuse struct sock fields") that
   switched over to using 'tun->socket.sk' instead of the redundantly
   available (and thus removed) 'tun->sk', and 2b980dbd ("lsm: Add hooks
   to the TUN driver") which added a new 'tun->sk' use.

   Noted in 'next' by Stephen Rothwell.

1 files changed, 5 insertions, 11 deletions

diff --git a/net/rds/iw.c b/net/rds/iw.c
index d16e1cbc8e83..db224f7c2937 100644
--- a/net/rds/iw.c
+++ b/net/rds/iw.c
@@ -83,23 +83,16 @@ void rds_iw_add_one(struct ib_device *device)
         rds_iwdev->max_wrs = dev_attr->max_qp_wr;
         rds_iwdev->max_sge = min(dev_attr->max_sge, RDS_IW_MAX_SGE);
 
-        rds_iwdev->page_shift = max(PAGE_SHIFT, ffs(dev_attr->page_size_cap) - 1);
-
         rds_iwdev->dev = device;
         rds_iwdev->pd = ib_alloc_pd(device);
         if (IS_ERR(rds_iwdev->pd))
                 goto free_dev;
 
         if (!rds_iwdev->dma_local_lkey) {
-                if (device->node_type != RDMA_NODE_RNIC) {
-                        rds_iwdev->mr = ib_get_dma_mr(rds_iwdev->pd,
-                                                IB_ACCESS_LOCAL_WRITE);
-                } else {
-                        rds_iwdev->mr = ib_get_dma_mr(rds_iwdev->pd,
-                                                IB_ACCESS_REMOTE_READ |
-                                                IB_ACCESS_REMOTE_WRITE |
-                                                IB_ACCESS_LOCAL_WRITE);
-                }
+                rds_iwdev->mr = ib_get_dma_mr(rds_iwdev->pd,
+                                        IB_ACCESS_REMOTE_READ |
+                                        IB_ACCESS_REMOTE_WRITE |
+                                        IB_ACCESS_LOCAL_WRITE);
                 if (IS_ERR(rds_iwdev->mr))
                         goto err_pd;
         } else
@@ -291,6 +284,7 @@ struct rds_transport rds_iw_transport = {
         .flush_mrs              = rds_iw_flush_mrs,
         .t_owner                = THIS_MODULE,
         .t_name                 = "iwarp",
+        .t_type                 = RDS_TRANS_IWARP,
         .t_prefer_loopback      = 1,
 };