3 files changed, 12 insertions, 9 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index 560dafd83adf..a3d8d44cb7f4 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2481,10 +2481,10 @@ static int dev_gso_segment(struct sk_buff *skb, netdev_features_t features)
 }
 
 static netdev_features_t harmonize_features(struct sk_buff *skb,
-        __be16 protocol, netdev_features_t features)
+        netdev_features_t features)
 {
         if (skb->ip_summed != CHECKSUM_NONE &&
-            !can_checksum_protocol(features, protocol)) {
+            !can_checksum_protocol(features, skb_network_protocol(skb))) {
                 features &= ~NETIF_F_ALL_CSUM;
         } else if (illegal_highdma(skb->dev, skb)) {
                 features &= ~NETIF_F_SG;
@@ -2505,20 +2505,18 @@ netdev_features_t netif_skb_features(struct sk_buff *skb)
                 struct vlan_ethhdr *veh = (struct vlan_ethhdr *)skb->data;
                 protocol = veh->h_vlan_encapsulated_proto;
         } else if (!vlan_tx_tag_present(skb)) {
-                return harmonize_features(skb, protocol, features);
+                return harmonize_features(skb, features);
         }
 
         features &= (skb->dev->vlan_features | NETIF_F_HW_VLAN_CTAG_TX |
                                                NETIF_F_HW_VLAN_STAG_TX);
 
-        if (protocol != htons(ETH_P_8021Q) && protocol != htons(ETH_P_8021AD)) {
-                return harmonize_features(skb, protocol, features);
-        } else {
+        if (protocol == htons(ETH_P_8021Q) || protocol == htons(ETH_P_8021AD))
                 features &= NETIF_F_SG | NETIF_F_HIGHDMA | NETIF_F_FRAGLIST |
                                 NETIF_F_GEN_CSUM | NETIF_F_HW_VLAN_CTAG_TX |
                                 NETIF_F_HW_VLAN_STAG_TX;
-                return harmonize_features(skb, protocol, features);
-        }
+
+        return harmonize_features(skb, features);
 }
 EXPORT_SYMBOL(netif_skb_features);
 
diff --git a/net/ipv4/gre_offload.c b/net/ipv4/gre_offload.c
index 775d5b532ece..55e6bfb3a289 100644
--- a/net/ipv4/gre_offload.c
+++ b/net/ipv4/gre_offload.c
@@ -100,6 +100,9 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb,
                 }
                 __skb_push(skb, tnl_hlen - ghl);
 
+                skb_reset_inner_headers(skb);
+                skb->encapsulation = 1;
+
                 skb_reset_mac_header(skb);
                 skb_set_network_header(skb, mac_len);
                 skb->mac_len = mac_len;
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index a0d7151ffbd9..766e6bab9113 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -2323,6 +2323,9 @@ struct sk_buff *skb_udp_tunnel_segment(struct sk_buff *skb,
                 struct udphdr *uh;
                 int udp_offset = outer_hlen - tnl_hlen;
 
+                skb_reset_inner_headers(skb);
+                skb->encapsulation = 1;
+
                 skb->mac_len = mac_len;
 
                 skb_push(skb, outer_hlen);
@@ -2345,7 +2348,6 @@ struct sk_buff *skb_udp_tunnel_segment(struct sk_buff *skb,
                                 uh->check = CSUM_MANGLED_0;
 
                 }
-                skb->ip_summed = CHECKSUM_NONE;
                 skb->protocol = protocol;
         } while ((skb = skb->next));
 out: