2 files changed, 7 insertions, 9 deletions

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 0bd2a4ff0842..353c13b91e8f 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -660,8 +660,12 @@ static void unicast_arp_send(struct sk_buff *skb, struct net_device *dev,
 
         path = __path_find(dev, phdr->hwaddr + 4);
         if (!path || !path->valid) {
-                if (!path)
+                int new_path = 0;
+
+                if (!path) {
                         path = path_rec_create(dev, phdr->hwaddr + 4);
+                        new_path = 1;
+                }
                 if (path) {
                         /* put pseudoheader back on for next time */
                         skb_push(skb, sizeof *phdr);
@@ -669,7 +673,8 @@ static void unicast_arp_send(struct sk_buff *skb, struct net_device *dev,
 
                         if (!path->query && path_rec_start(dev, path)) {
                                 spin_unlock_irqrestore(&priv->lock, flags);
-                                path_free(dev, path);
+                                if (new_path)
+                                        path_free(dev, path);
                                 return;
                         } else
                                 __path_add(dev, path);
diff --git a/drivers/infiniband/ulp/iser/iser_verbs.c b/drivers/infiniband/ulp/iser/iser_verbs.c
index 319b188145be..ea9e1556e0d6 100644
--- a/drivers/infiniband/ulp/iser/iser_verbs.c
+++ b/drivers/infiniband/ulp/iser/iser_verbs.c
@@ -401,13 +401,6 @@ static void iser_route_handler(struct rdma_cm_id *cma_id)
         if (ret)
                 goto failure;
 
-        iser_dbg("path.mtu is %d setting it to %d\n",
-                 cma_id->route.path_rec->mtu, IB_MTU_1024);
-
-        /* we must set the MTU to 1024 as this is what the target is assuming */
-        if (cma_id->route.path_rec->mtu > IB_MTU_1024)
-                cma_id->route.path_rec->mtu = IB_MTU_1024;
-
         memset(&conn_param, 0, sizeof conn_param);
         conn_param.responder_resources = 4;
         conn_param.initiator_depth     = 1;