Commit ab6a5bb6 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files

[TCP]: Introduce tcp_hdrlen() and tcp_optlen() 



The ip_hdrlen() buddy, created to reduce the number of skb->h.th-> uses and to
avoid the longer, open coded equivalent.

Ditched a no-op in bnx2 in the process.

I wonder if we should have a BUG_ON(skb->h.th->doff < 5) in tcp_optlen()...

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 88c7664f

drivers/net/atl1/atl1_main.c

+3 −4
Original line number Diff line number Diff line
@@ -1307,7 +1307,7 @@ static int atl1_tso(struct atl1_adapter *adapter, struct sk_buff *skb, 


			tso->tsopl |= (iph->ihl &

				CSUM_PARAM_IPHL_MASK) << CSUM_PARAM_IPHL_SHIFT;

			tso->tsopl |= ((skb->h.th->doff << 2) &

			tso->tsopl |= (tcp_hdrlen(skb) &

				TSO_PARAM_TCPHDRLEN_MASK) << TSO_PARAM_TCPHDRLEN_SHIFT;

			tso->tsopl |= (skb_shinfo(skb)->gso_size &

				TSO_PARAM_MSS_MASK) << TSO_PARAM_MSS_SHIFT;
@@ -1369,8 +1369,7 @@ static void atl1_tx_map(struct atl1_adapter *adapter, 


	if (tcp_seg) {

		/* TSO/GSO */

		proto_hdr_len = (skb_transport_offset(skb) +

				 (skb->h.th->doff << 2));

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

		buffer_info->length = proto_hdr_len;

		page = virt_to_page(skb->data);

		offset = (unsigned long)skb->data & ~PAGE_MASK;
@@ -1563,7 +1562,7 @@ static int atl1_xmit_frame(struct sk_buff *skb, struct net_device *netdev) 
	if (mss) {

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

			proto_hdr_len = (skb_transport_offset(skb) +

					 (skb->h.th->doff << 2));

					 tcp_hdrlen(skb));

			if (unlikely(proto_hdr_len > len)) {

				dev_kfree_skb_any(skb);

				return NETDEV_TX_OK;

drivers/net/bnx2.c

+3 −4
Original line number Diff line number Diff line
@@ -4521,13 +4521,12 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev) 
			return NETDEV_TX_OK;

		}



		tcp_opt_len = ((skb->h.th->doff - 5) * 4);

		vlan_tag_flags |= TX_BD_FLAGS_SW_LSO;



		tcp_opt_len = 0;

		if (skb->h.th->doff > 5) {

			tcp_opt_len = (skb->h.th->doff - 5) << 2;

		}

		if (skb->h.th->doff > 5)

			tcp_opt_len = tcp_optlen(skb);



		ip_tcp_len = ip_hdrlen(skb) + sizeof(struct tcphdr);



		iph = ip_hdr(skb);

drivers/net/e1000/e1000_main.c

+2 −2
Original line number Diff line number Diff line
@@ -2887,7 +2887,7 @@ e1000_tso(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring, 
				return err;

		}



		hdr_len = (skb_transport_offset(skb) + (skb->h.th->doff << 2));

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

		mss = skb_shinfo(skb)->gso_size;

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

			struct iphdr *iph = ip_hdr(skb);
@@ -3292,7 +3292,7 @@ e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev) 
		/* TSO Workaround for 82571/2/3 Controllers -- if skb->data

		* points to just header, pull a few bytes of payload from

		* frags into skb->data */

		hdr_len = (skb_transport_offset(skb) + (skb->h.th->doff << 2));

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

		if (skb->data_len && (hdr_len == (skb->len - skb->data_len))) {

			switch (adapter->hw.mac_type) {

				unsigned int pull_size;

drivers/net/ehea/ehea_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1300,7 +1300,7 @@ static void write_swqe2_TSO(struct sk_buff *skb, 
	/* copy only eth/ip/tcp headers to immediate data and

	 * the rest of skb->data to sg1entry

	 */

	headersize = ETH_HLEN + ip_hdrlen(skb) + (skb->h.th->doff * 4);

	headersize = ETH_HLEN + ip_hdrlen(skb) + tcp_hdrlen(skb);



	skb_data_size = skb->len - skb->data_len;

drivers/net/ixgb/ixgb_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1190,7 +1190,7 @@ ixgb_tso(struct ixgb_adapter *adapter, struct sk_buff *skb) 
				return err;

		}



		hdr_len = (skb_transport_offset(skb) + (skb->h.th->doff << 2));

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

		mss = skb_shinfo(skb)->gso_size;

		iph = ip_hdr(skb);

		iph->tot_len = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE