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

Commit 1594712f authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by David S. Miller
Browse files

ixgbe: fix gso type 



ixgbe set gso_size but not gso_type. This leads to
crashes in macvtap.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3955b22b

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

+6 −2
Original line number Diff line number Diff line
@@ -1401,6 +1401,10 @@ 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;

}



static void ixgbe_update_rsc_stats(struct ixgbe_ring *rx_ring,
@@ -1435,6 +1439,8 @@ 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);
@@ -1450,8 +1456,6 @@ 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,