Commit 504148fe authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: add skb_[inner_]tcp_all_headers helpers 



Most drivers use "skb_transport_offset(skb) + tcp_hdrlen(skb)"
to compute headers length for a TCP packet, but others
use more convoluted (but equivalent) ways.

Add skb_tcp_all_headers() and skb_inner_tcp_all_headers()
helpers to harmonize this a bit.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 04740c53

drivers/infiniband/ulp/ipoib/ipoib_ib.c

+1 −1
Original line number Diff line number Diff line
@@ -573,7 +573,7 @@ int ipoib_send(struct net_device *dev, struct sk_buff *skb, 
	unsigned int usable_sge = priv->max_send_sge - !!skb_headlen(skb);



	if (skb_is_gso(skb)) {

		hlen = skb_transport_offset(skb) + tcp_hdrlen(skb);

		hlen = skb_tcp_all_headers(skb);

		phead = skb->data;

		if (unlikely(!skb_pull(skb, hlen))) {

			ipoib_warn(priv, "linear data too small\n");

drivers/net/ethernet/amd/xgbe/xgbe-drv.c

+2 −4
Original line number Diff line number Diff line
@@ -1673,12 +1673,10 @@ static int xgbe_prep_tso(struct sk_buff *skb, struct xgbe_packet_data *packet) 
		return ret;



	if (XGMAC_GET_BITS(packet->attributes, TX_PACKET_ATTRIBUTES, VXLAN)) {

		packet->header_len = skb_inner_transport_offset(skb) +

				     inner_tcp_hdrlen(skb);

		packet->header_len = skb_inner_tcp_all_headers(skb);

		packet->tcp_header_len = inner_tcp_hdrlen(skb);

	} else {

		packet->header_len = skb_transport_offset(skb) +

				     tcp_hdrlen(skb);

		packet->header_len = skb_tcp_all_headers(skb);

		packet->tcp_header_len = tcp_hdrlen(skb);

	}

	packet->tcp_payload_len = skb->len - packet->header_len;

drivers/net/ethernet/atheros/atl1c/atl1c_main.c

+5 −4
Original line number Diff line number Diff line
@@ -2072,7 +2072,7 @@ static u16 atl1c_cal_tpd_req(const struct sk_buff *skb) 
	tpd_req = skb_shinfo(skb)->nr_frags + 1;



	if (skb_is_gso(skb)) {

		proto_hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);

		proto_hdr_len = skb_tcp_all_headers(skb);

		if (proto_hdr_len < skb_headlen(skb))

			tpd_req++;

		if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6)
@@ -2107,7 +2107,7 @@ static int atl1c_tso_csum(struct atl1c_adapter *adapter, 
			if (real_len < skb->len)

				pskb_trim(skb, real_len);



			hdr_len = (skb_transport_offset(skb) + tcp_hdrlen(skb));

			hdr_len = skb_tcp_all_headers(skb);

			if (unlikely(skb->len == hdr_len)) {

				/* only xsum need */

				if (netif_msg_tx_queued(adapter))
@@ -2132,7 +2132,7 @@ static int atl1c_tso_csum(struct atl1c_adapter *adapter, 
			*tpd = atl1c_get_tpd(adapter, queue);

			ipv6_hdr(skb)->payload_len = 0;

			/* check payload == 0 byte ? */

			hdr_len = (skb_transport_offset(skb) + tcp_hdrlen(skb));

			hdr_len = skb_tcp_all_headers(skb);

			if (unlikely(skb->len == hdr_len)) {

				/* only xsum need */

				if (netif_msg_tx_queued(adapter))
@@ -2219,7 +2219,8 @@ static int atl1c_tx_map(struct atl1c_adapter *adapter, 
	tso = (tpd->word1 >> TPD_LSO_EN_SHIFT) & TPD_LSO_EN_MASK;

	if (tso) {

		/* TSO */

		map_len = hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);

		hdr_len = skb_tcp_all_headers(skb);

		map_len = hdr_len;

		use_tpd = tpd;



		buffer_info = atl1c_get_tx_buffer(adapter, use_tpd);

drivers/net/ethernet/atheros/atl1e/atl1e_main.c

+4 −4
Original line number Diff line number Diff line
@@ -1609,8 +1609,7 @@ static u16 atl1e_cal_tdp_req(const struct sk_buff *skb) 
	if (skb_is_gso(skb)) {

		if (skb->protocol == htons(ETH_P_IP) ||

		   (skb_shinfo(skb)->gso_type == SKB_GSO_TCPV6)) {

			proto_hdr_len = skb_transport_offset(skb) +

					tcp_hdrlen(skb);

			proto_hdr_len = skb_tcp_all_headers(skb);

			if (proto_hdr_len < skb_headlen(skb)) {

				tpd_req += ((skb_headlen(skb) - proto_hdr_len +

					   MAX_TX_BUF_LEN - 1) >>
@@ -1645,7 +1644,7 @@ static int atl1e_tso_csum(struct atl1e_adapter *adapter, 
			if (real_len < skb->len)

				pskb_trim(skb, real_len);



			hdr_len = (skb_transport_offset(skb) + tcp_hdrlen(skb));

			hdr_len = skb_tcp_all_headers(skb);

			if (unlikely(skb->len == hdr_len)) {

				/* only xsum need */

				netdev_warn(adapter->netdev,
@@ -1713,7 +1712,8 @@ static int atl1e_tx_map(struct atl1e_adapter *adapter, 
	segment = (tpd->word3 >> TPD_SEGMENT_EN_SHIFT) & TPD_SEGMENT_EN_MASK;

	if (segment) {

		/* TSO */

		map_len = hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);

		hdr_len = skb_tcp_all_headers(skb);

		map_len = hdr_len;

		use_tpd = tpd;



		tx_buffer = atl1e_get_tx_buffer(adapter, use_tpd);

drivers/net/ethernet/atheros/atlx/atl1.c

+3 −4
Original line number Diff line number Diff line
@@ -2115,7 +2115,7 @@ static int atl1_tso(struct atl1_adapter *adapter, struct sk_buff *skb, 
				ntohs(iph->tot_len));

			if (real_len < skb->len)

				pskb_trim(skb, real_len);

			hdr_len = (skb_transport_offset(skb) + tcp_hdrlen(skb));

			hdr_len = skb_tcp_all_headers(skb);

			if (skb->len == hdr_len) {

				iph->check = 0;

				tcp_hdr(skb)->check =
@@ -2206,7 +2206,7 @@ static void atl1_tx_map(struct atl1_adapter *adapter, struct sk_buff *skb, 
	retval = (ptpd->word3 >> TPD_SEGMENT_EN_SHIFT) & TPD_SEGMENT_EN_MASK;

	if (retval) {

		/* TSO */

		hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);

		hdr_len = skb_tcp_all_headers(skb);

		buffer_info->length = hdr_len;

		page = virt_to_page(skb->data);

		offset = offset_in_page(skb->data);
@@ -2367,8 +2367,7 @@ static netdev_tx_t atl1_xmit_frame(struct sk_buff *skb, 
	mss = skb_shinfo(skb)->gso_size;

	if (mss) {

		if (skb->protocol == htons(ETH_P_IP)) {

			proto_hdr_len = (skb_transport_offset(skb) +

					 tcp_hdrlen(skb));

			proto_hdr_len = skb_tcp_all_headers(skb);

			if (unlikely(proto_hdr_len > len)) {

				dev_kfree_skb_any(skb);

				return NETDEV_TX_OK;