Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09f090d8 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'libcxgb-next' 



Varun Prakash says:

====================
iw_cxgb4,cxgbit: remove duplicate code

This patch series removes duplicate code from
iw_cxgb4 and cxgbit by adding common function
definitions in libcxgb.

Please review.
====================

Reviewed-by: default avatarSteve Wise <swise@opengridcomputing.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2679d040 6e3b6fc2

drivers/infiniband/hw/cxgb4/Kconfig

+1 −0
Original line number Diff line number Diff line 
config INFINIBAND_CXGB4

	tristate "Chelsio T4/T5 RDMA Driver"

	depends on CHELSIO_T4 && INET && (IPV6 || IPV6=n)

	select CHELSIO_LIB

	select GENERIC_ALLOCATOR

	---help---

	  This is an iWARP/RDMA driver for the Chelsio T4 and T5

drivers/infiniband/hw/cxgb4/Makefile

+1 −0
Original line number Diff line number Diff line 
ccflags-y := -Idrivers/net/ethernet/chelsio/cxgb4

ccflags-y += -Idrivers/net/ethernet/chelsio/libcxgb



obj-$(CONFIG_INFINIBAND_CXGB4) += iw_cxgb4.o

drivers/infiniband/hw/cxgb4/cm.c

+79 −209
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 


#include <rdma/ib_addr.h>



#include <libcxgb_cm.h>

#include "iw_cxgb4.h"

#include "clip_tbl.h"
@@ -239,15 +240,13 @@ int c4iw_ofld_send(struct c4iw_rdev *rdev, struct sk_buff *skb) 


static void release_tid(struct c4iw_rdev *rdev, u32 hwtid, struct sk_buff *skb)

{

	struct cpl_tid_release *req;

	u32 len = roundup(sizeof(struct cpl_tid_release), 16);



	skb = get_skb(skb, sizeof *req, GFP_KERNEL);

	skb = get_skb(skb, len, GFP_KERNEL);

	if (!skb)

		return;

	req = (struct cpl_tid_release *) skb_put(skb, sizeof(*req));

	INIT_TP_WR(req, hwtid);

	OPCODE_TID(req) = cpu_to_be32(MK_OPCODE_TID(CPL_TID_RELEASE, hwtid));

	set_wr_txq(skb, CPL_PRIORITY_SETUP, 0);



	cxgb_mk_tid_release(skb, len, hwtid, 0);

	c4iw_ofld_send(rdev, skb);

	return;

}
@@ -464,72 +463,6 @@ static struct net_device *get_real_dev(struct net_device *egress_dev) 
	return rdma_vlan_dev_real_dev(egress_dev) ? : egress_dev;

}



static int our_interface(struct c4iw_dev *dev, struct net_device *egress_dev)

{

	int i;



	egress_dev = get_real_dev(egress_dev);

	for (i = 0; i < dev->rdev.lldi.nports; i++)

		if (dev->rdev.lldi.ports[i] == egress_dev)

			return 1;

	return 0;

}



static struct dst_entry *find_route6(struct c4iw_dev *dev, __u8 *local_ip,

				     __u8 *peer_ip, __be16 local_port,

				     __be16 peer_port, u8 tos,

				     __u32 sin6_scope_id)

{

	struct dst_entry *dst = NULL;



	if (IS_ENABLED(CONFIG_IPV6)) {

		struct flowi6 fl6;



		memset(&fl6, 0, sizeof(fl6));

		memcpy(&fl6.daddr, peer_ip, 16);

		memcpy(&fl6.saddr, local_ip, 16);

		if (ipv6_addr_type(&fl6.daddr) & IPV6_ADDR_LINKLOCAL)

			fl6.flowi6_oif = sin6_scope_id;

		dst = ip6_route_output(&init_net, NULL, &fl6);

		if (!dst)

			goto out;

		if (!our_interface(dev, ip6_dst_idev(dst)->dev) &&

		    !(ip6_dst_idev(dst)->dev->flags & IFF_LOOPBACK)) {

			dst_release(dst);

			dst = NULL;

		}

	}



out:

	return dst;

}



static struct dst_entry *find_route(struct c4iw_dev *dev, __be32 local_ip,

				 __be32 peer_ip, __be16 local_port,

				 __be16 peer_port, u8 tos)

{

	struct rtable *rt;

	struct flowi4 fl4;

	struct neighbour *n;



	rt = ip_route_output_ports(&init_net, &fl4, NULL, peer_ip, local_ip,

				   peer_port, local_port, IPPROTO_TCP,

				   tos, 0);

	if (IS_ERR(rt))

		return NULL;

	n = dst_neigh_lookup(&rt->dst, &peer_ip);

	if (!n)

		return NULL;

	if (!our_interface(dev, n->dev) &&

	    !(n->dev->flags & IFF_LOOPBACK)) {

		neigh_release(n);

		dst_release(&rt->dst);

		return NULL;

	}

	neigh_release(n);

	return &rt->dst;

}



static void arp_failure_discard(void *handle, struct sk_buff *skb)

{

	pr_err(MOD "ARP failure\n");
@@ -704,56 +637,32 @@ static int send_flowc(struct c4iw_ep *ep) 


static int send_halfclose(struct c4iw_ep *ep)

{

	struct cpl_close_con_req *req;

	struct sk_buff *skb = skb_dequeue(&ep->com.ep_skb_list);

	int wrlen = roundup(sizeof *req, 16);

	u32 wrlen = roundup(sizeof(struct cpl_close_con_req), 16);



	PDBG("%s ep %p tid %u\n", __func__, ep, ep->hwtid);

	if (WARN_ON(!skb))

		return -ENOMEM;



	set_wr_txq(skb, CPL_PRIORITY_DATA, ep->txq_idx);

	t4_set_arp_err_handler(skb, NULL, arp_failure_discard);

	req = (struct cpl_close_con_req *) skb_put(skb, wrlen);

	memset(req, 0, wrlen);

	INIT_TP_WR(req, ep->hwtid);

	OPCODE_TID(req) = cpu_to_be32(MK_OPCODE_TID(CPL_CLOSE_CON_REQ,

						    ep->hwtid));

	cxgb_mk_close_con_req(skb, wrlen, ep->hwtid, ep->txq_idx,

			      NULL, arp_failure_discard);



	return c4iw_l2t_send(&ep->com.dev->rdev, skb, ep->l2t);

}



static int send_abort(struct c4iw_ep *ep)

{

	struct cpl_abort_req *req;

	int wrlen = roundup(sizeof *req, 16);

	u32 wrlen = roundup(sizeof(struct cpl_abort_req), 16);

	struct sk_buff *req_skb = skb_dequeue(&ep->com.ep_skb_list);



	PDBG("%s ep %p tid %u\n", __func__, ep, ep->hwtid);

	if (WARN_ON(!req_skb))

		return -ENOMEM;



	set_wr_txq(req_skb, CPL_PRIORITY_DATA, ep->txq_idx);

	t4_set_arp_err_handler(req_skb, ep, abort_arp_failure);

	req = (struct cpl_abort_req *)skb_put(req_skb, wrlen);

	memset(req, 0, wrlen);

	INIT_TP_WR(req, ep->hwtid);

	OPCODE_TID(req) = cpu_to_be32(MK_OPCODE_TID(CPL_ABORT_REQ, ep->hwtid));

	req->cmd = CPL_ABORT_SEND_RST;

	return c4iw_l2t_send(&ep->com.dev->rdev, req_skb, ep->l2t);

}



static void best_mtu(const unsigned short *mtus, unsigned short mtu,

		     unsigned int *idx, int use_ts, int ipv6)

{

	unsigned short hdr_size = (ipv6 ?

				   sizeof(struct ipv6hdr) :

				   sizeof(struct iphdr)) +

				  sizeof(struct tcphdr) +

				  (use_ts ?

				   round_up(TCPOLEN_TIMESTAMP, 4) : 0);

	unsigned short data_size = mtu - hdr_size;

	cxgb_mk_abort_req(req_skb, wrlen, ep->hwtid, ep->txq_idx,

			  ep, abort_arp_failure);



	cxgb4_best_aligned_mtu(mtus, hdr_size, data_size, 8, idx);

	return c4iw_l2t_send(&ep->com.dev->rdev, req_skb, ep->l2t);

}



static int send_connect(struct c4iw_ep *ep)
@@ -768,7 +677,7 @@ static int send_connect(struct c4iw_ep *ep) 
	u64 opt0;

	u32 opt2;

	unsigned int mtu_idx;

	int wscale;

	u32 wscale;

	int win, sizev4, sizev6, wrlen;

	struct sockaddr_in *la = (struct sockaddr_in *)

				 &ep->com.local_addr;
@@ -815,10 +724,10 @@ static int send_connect(struct c4iw_ep *ep) 
	}

	set_wr_txq(skb, CPL_PRIORITY_SETUP, ep->ctrlq_idx);



	best_mtu(ep->com.dev->rdev.lldi.mtus, ep->mtu, &mtu_idx,

	cxgb_best_mtu(ep->com.dev->rdev.lldi.mtus, ep->mtu, &mtu_idx,

		      enable_tcp_timestamps,

		 (AF_INET == ep->com.remote_addr.ss_family) ? 0 : 1);

	wscale = compute_wscale(rcv_win);

		      (ep->com.remote_addr.ss_family == AF_INET) ? 0 : 1);

	wscale = cxgb_compute_wscale(rcv_win);



	/*

	 * Specify the largest window that will fit in opt0. The
@@ -1445,9 +1354,9 @@ static void established_upcall(struct c4iw_ep *ep) 


static int update_rx_credits(struct c4iw_ep *ep, u32 credits)

{

	struct cpl_rx_data_ack *req;

	struct sk_buff *skb;

	int wrlen = roundup(sizeof *req, 16);

	u32 wrlen = roundup(sizeof(struct cpl_rx_data_ack), 16);

	u32 credit_dack;



	PDBG("%s ep %p tid %u credits %u\n", __func__, ep, ep->hwtid, credits);

	skb = get_skb(NULL, wrlen, GFP_KERNEL);
@@ -1464,15 +1373,12 @@ static int update_rx_credits(struct c4iw_ep *ep, u32 credits) 
	if (ep->rcv_win > RCV_BUFSIZ_M * 1024)

		credits += ep->rcv_win - RCV_BUFSIZ_M * 1024;



	req = (struct cpl_rx_data_ack *) skb_put(skb, wrlen);

	memset(req, 0, wrlen);

	INIT_TP_WR(req, ep->hwtid);

	OPCODE_TID(req) = cpu_to_be32(MK_OPCODE_TID(CPL_RX_DATA_ACK,

						    ep->hwtid));

	req->credit_dack = cpu_to_be32(credits | RX_FORCE_ACK_F |

				       RX_DACK_CHANGE_F |

				       RX_DACK_MODE_V(dack_mode));

	set_wr_txq(skb, CPL_PRIORITY_ACK, ep->ctrlq_idx);

	credit_dack = credits | RX_FORCE_ACK_F | RX_DACK_CHANGE_F |

		      RX_DACK_MODE_V(dack_mode);



	cxgb_mk_rx_data_ack(skb, wrlen, ep->hwtid, ep->ctrlq_idx,

			    credit_dack);



	c4iw_ofld_send(&ep->com.dev->rdev, skb);

	return credits;

}
@@ -1970,7 +1876,7 @@ static int send_fw_act_open_req(struct c4iw_ep *ep, unsigned int atid) 
	struct sk_buff *skb;

	struct fw_ofld_connection_wr *req;

	unsigned int mtu_idx;

	int wscale;

	u32 wscale;

	struct sockaddr_in *sin;

	int win;
@@ -1995,10 +1901,10 @@ static int send_fw_act_open_req(struct c4iw_ep *ep, unsigned int atid) 
			htons(FW_OFLD_CONNECTION_WR_CPLRXDATAACK_F);

	req->tcb.tx_max = (__force __be32) jiffies;

	req->tcb.rcv_adv = htons(1);

	best_mtu(ep->com.dev->rdev.lldi.mtus, ep->mtu, &mtu_idx,

	cxgb_best_mtu(ep->com.dev->rdev.lldi.mtus, ep->mtu, &mtu_idx,

		      enable_tcp_timestamps,

		 (AF_INET == ep->com.remote_addr.ss_family) ? 0 : 1);

	wscale = compute_wscale(rcv_win);

		      (ep->com.remote_addr.ss_family == AF_INET) ? 0 : 1);

	wscale = cxgb_compute_wscale(rcv_win);



	/*

	 * Specify the largest window that will fit in opt0. The
@@ -2052,15 +1958,6 @@ static inline int act_open_has_tid(int status) 
		status != CPL_ERR_CONN_EXIST);

}



/* Returns whether a CPL status conveys negative advice.

 */

static int is_neg_adv(unsigned int status)

{

	return status == CPL_ERR_RTX_NEG_ADVICE ||

	       status == CPL_ERR_PERSIST_NEG_ADVICE ||

	       status == CPL_ERR_KEEPALV_NEG_ADVICE;

}



static char *neg_adv_str(unsigned int status)

{

	switch (status) {
@@ -2214,15 +2111,20 @@ static int c4iw_reconnect(struct c4iw_ep *ep) 


	/* find a route */

	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,

		ep->dst = cxgb_find_route(&ep->com.dev->rdev.lldi, get_real_dev,

					  laddr->sin_addr.s_addr,

					  raddr->sin_addr.s_addr,

					  laddr->sin_port,

					  raddr->sin_port, ep->com.cm_id->tos);

		iptype = 4;

		ra = (__u8 *)&raddr->sin_addr;

	} else {

		ep->dst = find_route6(ep->com.dev, laddr6->sin6_addr.s6_addr,

		ep->dst = cxgb_find_route6(&ep->com.dev->rdev.lldi,

					   get_real_dev,

					   laddr6->sin6_addr.s6_addr,

					   raddr6->sin6_addr.s6_addr,

				      laddr6->sin6_port, raddr6->sin6_port, 0,

					   laddr6->sin6_port,

					   raddr6->sin6_port, 0,

					   raddr6->sin6_scope_id);

		iptype = 6;

		ra = (__u8 *)&raddr6->sin6_addr;
@@ -2295,7 +2197,7 @@ static int act_open_rpl(struct c4iw_dev *dev, struct sk_buff *skb) 
	PDBG("%s ep %p atid %u status %u errno %d\n", __func__, ep, atid,

	     status, status2errno(status));



	if (is_neg_adv(status)) {

	if (cxgb_is_neg_adv(status)) {

		PDBG("%s Connection problems for atid %u status %u (%s)\n",

		     __func__, atid, status, neg_adv_str(status));

		ep->stats.connect_neg_adv++;
@@ -2422,7 +2324,7 @@ static int accept_cr(struct c4iw_ep *ep, struct sk_buff *skb, 
	unsigned int mtu_idx;

	u64 opt0;

	u32 opt2;

	int wscale;

	u32 wscale;

	struct cpl_t5_pass_accept_rpl *rpl5 = NULL;

	int win;

	enum chip_type adapter_type = ep->com.dev->rdev.lldi.adapter_type;
@@ -2443,10 +2345,10 @@ static int accept_cr(struct c4iw_ep *ep, struct sk_buff *skb, 
	OPCODE_TID(rpl) = cpu_to_be32(MK_OPCODE_TID(CPL_PASS_ACCEPT_RPL,

						    ep->hwtid));



	best_mtu(ep->com.dev->rdev.lldi.mtus, ep->mtu, &mtu_idx,

	cxgb_best_mtu(ep->com.dev->rdev.lldi.mtus, ep->mtu, &mtu_idx,

		      enable_tcp_timestamps && req->tcpopt.tstamp,

		 (AF_INET == ep->com.remote_addr.ss_family) ? 0 : 1);

	wscale = compute_wscale(rcv_win);

		      (ep->com.remote_addr.ss_family == AF_INET) ? 0 : 1);

	wscale = cxgb_compute_wscale(rcv_win);



	/*

	 * Specify the largest window that will fit in opt0. The
@@ -2518,42 +2420,6 @@ static void reject_cr(struct c4iw_dev *dev, u32 hwtid, struct sk_buff *skb) 
	return;

}



static void get_4tuple(struct cpl_pass_accept_req *req, enum chip_type type,

		       int *iptype, __u8 *local_ip, __u8 *peer_ip,

		       __be16 *local_port, __be16 *peer_port)

{

	int eth_len = (CHELSIO_CHIP_VERSION(type) <= CHELSIO_T5) ?

		      ETH_HDR_LEN_G(be32_to_cpu(req->hdr_len)) :

		      T6_ETH_HDR_LEN_G(be32_to_cpu(req->hdr_len));

	int ip_len = (CHELSIO_CHIP_VERSION(type) <= CHELSIO_T5) ?

		     IP_HDR_LEN_G(be32_to_cpu(req->hdr_len)) :

		     T6_IP_HDR_LEN_G(be32_to_cpu(req->hdr_len));

	struct iphdr *ip = (struct iphdr *)((u8 *)(req + 1) + eth_len);

	struct ipv6hdr *ip6 = (struct ipv6hdr *)((u8 *)(req + 1) + eth_len);

	struct tcphdr *tcp = (struct tcphdr *)

			     ((u8 *)(req + 1) + eth_len + ip_len);



	if (ip->version == 4) {

		PDBG("%s saddr 0x%x daddr 0x%x sport %u dport %u\n", __func__,

		     ntohl(ip->saddr), ntohl(ip->daddr), ntohs(tcp->source),

		     ntohs(tcp->dest));

		*iptype = 4;

		memcpy(peer_ip, &ip->saddr, 4);

		memcpy(local_ip, &ip->daddr, 4);

	} else {

		PDBG("%s saddr %pI6 daddr %pI6 sport %u dport %u\n", __func__,

		     ip6->saddr.s6_addr, ip6->daddr.s6_addr, ntohs(tcp->source),

		     ntohs(tcp->dest));

		*iptype = 6;

		memcpy(peer_ip, ip6->saddr.s6_addr, 16);

		memcpy(local_ip, ip6->daddr.s6_addr, 16);

	}

	*peer_port = tcp->source;

	*local_port = tcp->dest;



	return;

}



static int pass_accept_req(struct c4iw_dev *dev, struct sk_buff *skb)

{

	struct c4iw_ep *child_ep = NULL, *parent_ep;
@@ -2582,8 +2448,8 @@ static int pass_accept_req(struct c4iw_dev *dev, struct sk_buff *skb) 
		goto reject;

	}



	get_4tuple(req, parent_ep->com.dev->rdev.lldi.adapter_type, &iptype,

		   local_ip, peer_ip, &local_port, &peer_port);

	cxgb_get_4tuple(req, parent_ep->com.dev->rdev.lldi.adapter_type,

			&iptype, local_ip, peer_ip, &local_port, &peer_port);



	/* Find output route */

	if (iptype == 4)  {
@@ -2591,15 +2457,16 @@ static int pass_accept_req(struct c4iw_dev *dev, struct sk_buff *skb) 
		     , __func__, parent_ep, hwtid,

		     local_ip, peer_ip, ntohs(local_port),

		     ntohs(peer_port), peer_mss);

		dst = find_route(dev, *(__be32 *)local_ip, *(__be32 *)peer_ip,

				 local_port, peer_port,

				 tos);

		dst = cxgb_find_route(&dev->rdev.lldi, get_real_dev,

				      *(__be32 *)local_ip, *(__be32 *)peer_ip,

				      local_port, peer_port, tos);

	} else {

		PDBG("%s parent ep %p hwtid %u laddr %pI6 raddr %pI6 lport %d rport %d peer_mss %d\n"

		     , __func__, parent_ep, hwtid,

		     local_ip, peer_ip, ntohs(local_port),

		     ntohs(peer_port), peer_mss);

		dst = find_route6(dev, local_ip, peer_ip, local_port, peer_port,

		dst = cxgb_find_route6(&dev->rdev.lldi, get_real_dev,

				local_ip, peer_ip, local_port, peer_port,

				PASS_OPEN_TOS_G(ntohl(req->tos_stid)),

				((struct sockaddr_in6 *)

				 &parent_ep->com.local_addr)->sin6_scope_id);
@@ -2835,18 +2702,18 @@ static int peer_abort(struct c4iw_dev *dev, struct sk_buff *skb) 
{

	struct cpl_abort_req_rss *req = cplhdr(skb);

	struct c4iw_ep *ep;

	struct cpl_abort_rpl *rpl;

	struct sk_buff *rpl_skb;

	struct c4iw_qp_attributes attrs;

	int ret;

	int release = 0;

	unsigned int tid = GET_TID(req);

	u32 len = roundup(sizeof(struct cpl_abort_rpl), 16);



	ep = get_ep_from_tid(dev, tid);

	if (!ep)

		return 0;



	if (is_neg_adv(req->status)) {

	if (cxgb_is_neg_adv(req->status)) {

		PDBG("%s Negative advice on abort- tid %u status %d (%s)\n",

		     __func__, ep->hwtid, req->status,

		     neg_adv_str(req->status));
@@ -2939,11 +2806,9 @@ static int peer_abort(struct c4iw_dev *dev, struct sk_buff *skb) 
		release = 1;

		goto out;

	}

	set_wr_txq(skb, CPL_PRIORITY_DATA, ep->txq_idx);

	rpl = (struct cpl_abort_rpl *) skb_put(rpl_skb, sizeof(*rpl));

	INIT_TP_WR(rpl, ep->hwtid);

	OPCODE_TID(rpl) = cpu_to_be32(MK_OPCODE_TID(CPL_ABORT_RPL, ep->hwtid));

	rpl->cmd = CPL_ABORT_NO_RST;



	cxgb_mk_abort_rpl(rpl_skb, len, ep->hwtid, ep->txq_idx);



	c4iw_ofld_send(&ep->com.dev->rdev, rpl_skb);

out:

	if (release)
@@ -3375,8 +3240,10 @@ int c4iw_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) 
		PDBG("%s saddr %pI4 sport 0x%x raddr %pI4 rport 0x%x\n",

		     __func__, &laddr->sin_addr, ntohs(laddr->sin_port),

		     ra, ntohs(raddr->sin_port));

		ep->dst = find_route(dev, laddr->sin_addr.s_addr,

				     raddr->sin_addr.s_addr, laddr->sin_port,

		ep->dst = cxgb_find_route(&dev->rdev.lldi, get_real_dev,

					  laddr->sin_addr.s_addr,

					  raddr->sin_addr.s_addr,

					  laddr->sin_port,

					  raddr->sin_port, cm_id->tos);

	} else {

		iptype = 6;
@@ -3396,9 +3263,11 @@ int c4iw_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) 
		     __func__, laddr6->sin6_addr.s6_addr,

		     ntohs(laddr6->sin6_port),

		     raddr6->sin6_addr.s6_addr, ntohs(raddr6->sin6_port));

		ep->dst = find_route6(dev, laddr6->sin6_addr.s6_addr,

		ep->dst = cxgb_find_route6(&dev->rdev.lldi, get_real_dev,

					   laddr6->sin6_addr.s6_addr,

					   raddr6->sin6_addr.s6_addr,

				      laddr6->sin6_port, raddr6->sin6_port, 0,

					   laddr6->sin6_port,

					   raddr6->sin6_port, 0,

					   raddr6->sin6_scope_id);

	}

	if (!ep->dst) {
@@ -4041,8 +3910,9 @@ static int rx_pkt(struct c4iw_dev *dev, struct sk_buff *skb) 
	     ntohl(iph->daddr), ntohs(tcph->dest), ntohl(iph->saddr),

	     ntohs(tcph->source), iph->tos);



	dst = find_route(dev, iph->daddr, iph->saddr, tcph->dest, tcph->source,

			 iph->tos);

	dst = cxgb_find_route(&dev->rdev.lldi, get_real_dev,

			      iph->daddr, iph->saddr, tcph->dest,

			      tcph->source, iph->tos);

	if (!dst) {

		pr_err("%s - failed to find dst entry!\n",

		       __func__);
@@ -4317,7 +4187,7 @@ static int peer_abort_intr(struct c4iw_dev *dev, struct sk_buff *skb) 
		kfree_skb(skb);

		return 0;

	}

	if (is_neg_adv(req->status)) {

	if (cxgb_is_neg_adv(req->status)) {

		PDBG("%s Negative advice on abort- tid %u status %d (%s)\n",

		     __func__, ep->hwtid, req->status,

		     neg_adv_str(req->status));

drivers/infiniband/hw/cxgb4/iw_cxgb4.h

+0 −9
Original line number Diff line number Diff line
@@ -881,15 +881,6 @@ static inline struct c4iw_listen_ep *to_listen_ep(struct iw_cm_id *cm_id) 
	return cm_id->provider_data;

}



static inline int compute_wscale(int win)

{

	int wscale = 0;



	while (wscale < 14 && (65535<<wscale) < win)

		wscale++;

	return wscale;

}



static inline int ocqp_supported(const struct cxgb4_lld_info *infop)

{

#if defined(__i386__) || defined(__x86_64__) || defined(CONFIG_PPC64)

drivers/net/ethernet/chelsio/libcxgb/Makefile

+3 −1
Original line number Diff line number Diff line 
ccflags-y := -Idrivers/net/ethernet/chelsio/cxgb4



obj-$(CONFIG_CHELSIO_LIB) += libcxgb.o



libcxgb-y := libcxgb_ppm.o
 
libcxgb-y := libcxgb_ppm.o libcxgb_cm.o