---

yaml
---
r: 133628
b: refs/heads/master
c: 1aedb77
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71d98b4628ee869d62814f6d8607d76cab4b9ec5
+refs/heads/master: 1aedb7721f05461f777fdee25b50d8a168c425ed

trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c

@@ -660,21 +660,16 @@ static void unicast_arp_send(struct sk_buff *skb, struct net_device *dev,
 
 	path = __path_find(dev, phdr->hwaddr + 4);
 	if (!path || !path->valid) {
-		int new_path = 0;
-
-		if (!path) {
+		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);
 			__skb_queue_tail(&path->queue, skb);
 
 			if (!path->query && path_rec_start(dev, path)) {
 				spin_unlock_irqrestore(&priv->lock, flags);
-				if (new_path)
-					path_free(dev, path);
+				path_free(dev, path);
 				return;
 			} else
 				__path_add(dev, path);

trunk/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;