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

Commit 96be80ab authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

ixgbe: Only set gso_type to SKB_GSO_TCPV4 as RSC does not support IPv6 



The original fix that was applied for setting gso_type required more change
than necessary because it was assumed ixgbe does RSC on IPv6 frames and this
is not correct.  RSC is only supported with IPv4/TCP frames only.  As such we
can simplify the fix and avoid the unnecessary move of eth_type_trans.

The previous patch "ixgbe: fix gso type" and this patch reduce the entire fix
to one line that sets gso_type to TCPV4 if the frame is RSC.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 77c1090f

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+3 −6
Original line number Diff line number Diff line
@@ -1401,9 +1401,6 @@ static void ixgbe_set_rsc_gso_size(struct ixgbe_ring *ring, 
	/* set gso_size to avoid messing up TCP MSS */

	skb_shinfo(skb)->gso_size = DIV_ROUND_UP((skb->len - hdr_len),

						 IXGBE_CB(skb)->append_cnt);

	if (skb->protocol == __constant_htons(ETH_P_IPV6))

		skb_shinfo(skb)->gso_type = SKB_GSO_TCPV6;

	else

	skb_shinfo(skb)->gso_type = SKB_GSO_TCPV4;

}
@@ -1439,8 +1436,6 @@ static void ixgbe_process_skb_fields(struct ixgbe_ring *rx_ring, 
{

	struct net_device *dev = rx_ring->netdev;



	skb->protocol = eth_type_trans(skb, dev);



	ixgbe_update_rsc_stats(rx_ring, skb);



	ixgbe_rx_hash(rx_ring, rx_desc, skb);
@@ -1456,6 +1451,8 @@ static void ixgbe_process_skb_fields(struct ixgbe_ring *rx_ring, 
	}



	skb_record_rx_queue(skb, rx_ring->queue_index);



	skb->protocol = eth_type_trans(skb, dev);

}



static void ixgbe_rx_skb(struct ixgbe_q_vector *q_vector,