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

Commit 497166d6 authored by Michal Kalderon's avatar Michal Kalderon Committed by Greg Kroah-Hartman
Browse files

qed: Fix non TCP packets should be dropped on iWARP ll2 connection 




[ Upstream commit 16da09047d3fb991dc48af41f6d255fd578e8ca2 ]

FW workaround. The iWARP LL2 connection did not expect TCP packets
to arrive on it's connection. The fix drops any non-tcp packets

Fixes b5c29ca7 ("qed: iWARP CM - setup a ll2 connection for handling
SYN packets")

Signed-off-by: default avatarMichal Kalderon <Michal.Kalderon@cavium.com>
Signed-off-by: default avatarAriel Elior <Ariel.Elior@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e44c1733

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

+15 −0
Original line number Diff line number Diff line
@@ -1663,6 +1663,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;
@@ -1671,6 +1678,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]);