From: Doug Ledford <dledford@redhat.com>
Date: Wed, 16 Mar 2016 17:57:43 +0000 (-0400)
Subject: Merge branches 'nes', 'cxgb4' and 'iwpm' into k.o/for-4.6
X-Git-Tag: v4.9.8~2487^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=082eaa50838c6b70a8244f8b01d7ed7d686f84db;p=platform%2Fkernel%2Flinux-rpi3.git

Merge branches 'nes', 'cxgb4' and 'iwpm' into k.o/for-4.6
---

082eaa50838c6b70a8244f8b01d7ed7d686f84db
diff --cc drivers/infiniband/hw/cxgb4/cm.c
index cd2ff5f,cd2ff5f,8cd7b5e,6151883..6517113
--- a/drivers/infiniband/hw/cxgb4/cm.c
+++ b/drivers/infiniband/hw/cxgb4/cm.c
@@@@@ -2038,10 -2038,10 -2053,10 -1984,10 +1999,10 @@@@@ static int c4iw_reconnect(struct c4iw_e
    	insert_handle(ep->com.dev, &ep->com.dev->atid_idr, ep, ep->atid);
    
    	/* find a route */
--- 	if (ep->com.cm_id->local_addr.ss_family == AF_INET) {
+++ 	if (ep->com.cm_id->m_local_addr.ss_family == AF_INET) {
    		ep->dst = find_route(ep->com.dev, laddr->sin_addr.s_addr,
    				     raddr->sin_addr.s_addr, laddr->sin_port,
-- -				     raddr->sin_port, 0);
++ +				     raddr->sin_port, ep->com.cm_id->tos);
    		iptype = 4;
    		ra = (__u8 *)&raddr->sin_addr;
    	} else {