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

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

Merge branch 'qed-iWARP-related-fixes' 



Michal Kalderon says:

====================
qed: iWARP related fixes

This series contains two fixes related to iWARP flow.
====================

Signed-off-by: default avatarMichal Kalderon <Michal.Kalderon@cavium.com>
Signed-off-by: default avatarAriel Elior <Ariel.Elior@cavium.com>
parents fa6a91e9 16da0904

drivers/net/ethernet/qlogic/qed/qed_iwarp.c

+16 −1
Original line number Diff line number Diff line
@@ -1703,6 +1703,13 @@ qed_iwarp_parse_rx_pkt(struct qed_hwfn *p_hwfn, 
	iph = (struct iphdr *)((u8 *)(ethh) + eth_hlen);



	if (eth_type == ETH_P_IP) {

		if (iph->protocol != IPPROTO_TCP) {

			DP_NOTICE(p_hwfn,

				  "Unexpected ip protocol on ll2 %x\n",

				  iph->protocol);

			return -EINVAL;

		}



		cm_info->local_ip[0] = ntohl(iph->daddr);

		cm_info->remote_ip[0] = ntohl(iph->saddr);

		cm_info->ip_version = TCP_IPV4;
@@ -1711,6 +1718,14 @@ qed_iwarp_parse_rx_pkt(struct qed_hwfn *p_hwfn, 
		*payload_len = ntohs(iph->tot_len) - ip_hlen;

	} else if (eth_type == ETH_P_IPV6) {

		ip6h = (struct ipv6hdr *)iph;



		if (ip6h->nexthdr != IPPROTO_TCP) {

			DP_NOTICE(p_hwfn,

				  "Unexpected ip protocol on ll2 %x\n",

				  iph->protocol);

			return -EINVAL;

		}



		for (i = 0; i < 4; i++) {

			cm_info->local_ip[i] =

			    ntohl(ip6h->daddr.in6_u.u6_addr32[i]);
@@ -1928,8 +1943,8 @@ qed_iwarp_update_fpdu_length(struct qed_hwfn *p_hwfn, 
		/* Missing lower byte is now available */

		mpa_len = fpdu->fpdu_length | *mpa_data;

		fpdu->fpdu_length = QED_IWARP_FPDU_LEN_WITH_PAD(mpa_len);

		fpdu->mpa_frag_len = fpdu->fpdu_length;

		/* one byte of hdr */

		fpdu->mpa_frag_len = 1;

		fpdu->incomplete_bytes = fpdu->fpdu_length - 1;

		DP_VERBOSE(p_hwfn,

			   QED_MSG_RDMA,