Commit 625ac6ae authored by Dimitris Michailidis's avatar Dimitris Michailidis Committed by David S. Miller
Browse files

cxgb4: fix TSO descriptors 



Commit 1704d748 ("cxgb4vf: small changes
to message processing structures/macros") was incomplete and causes cxgb4
to write bad TSO descriptors.  Fix that up by reverting the offending part
of that commit and adjusting field accesses now that they are one level
deeper.

Signed-off-by: default avatarDimitris Michailidis <dm@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ba5d3c66

drivers/net/cxgb4/sge.c

+11 −11
Original line number Diff line number Diff line
@@ -931,23 +931,23 @@ out_free: dev_kfree_skb(skb); 


	ssi = skb_shinfo(skb);

	if (ssi->gso_size) {

		struct cpl_tx_pkt_lso_core *lso = (void *)(wr + 1);

		struct cpl_tx_pkt_lso *lso = (void *)wr;

		bool v6 = (ssi->gso_type & SKB_GSO_TCPV6) != 0;

		int l3hdr_len = skb_network_header_len(skb);

		int eth_xtra_len = skb_network_offset(skb) - ETH_HLEN;



		wr->op_immdlen = htonl(FW_WR_OP(FW_ETH_TX_PKT_WR) |

				       FW_WR_IMMDLEN(sizeof(*lso)));

		lso->lso_ctrl = htonl(LSO_OPCODE(CPL_TX_PKT_LSO) |

		lso->c.lso_ctrl = htonl(LSO_OPCODE(CPL_TX_PKT_LSO) |

					LSO_FIRST_SLICE | LSO_LAST_SLICE |

					LSO_IPV6(v6) |

					LSO_ETHHDR_LEN(eth_xtra_len / 4) |

					LSO_IPHDR_LEN(l3hdr_len / 4) |

					LSO_TCPHDR_LEN(tcp_hdr(skb)->doff));

		lso->ipid_ofst = htons(0);

		lso->mss = htons(ssi->gso_size);

		lso->seqno_offset = htonl(0);

		lso->len = htonl(skb->len);

		lso->c.ipid_ofst = htons(0);

		lso->c.mss = htons(ssi->gso_size);

		lso->c.seqno_offset = htonl(0);

		lso->c.len = htonl(skb->len);

		cpl = (void *)(lso + 1);

		cntrl = TXPKT_CSUM_TYPE(v6 ? TX_CSUM_TCPIP6 : TX_CSUM_TCPIP) |

			TXPKT_IPHDR_LEN(l3hdr_len) |

CRA Git | Maintained and supported by SUSTech CRA and CCSE