ixgbe: fix gso type

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

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 20a5af6d87d0..e1b2d22a2850 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -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,