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

Commit 5594c321 authored by Pravin B Shelar's avatar Pravin B Shelar Committed by David S. Miller
Browse files

Revert "udp: increase inner ip header ID during segmentation" 



This reverts commit d6a8c36d.
Next commit makes this commit unnecessary.

Acked-by: default avatarCong Wang <amwang@redhat.com>
Signed-off-by: default avatarPravin B Shelar <pshelar@nicira.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9cb690d1

net/ipv4/udp.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -2304,8 +2304,7 @@ static struct sk_buff *skb_udp_tunnel_segment(struct sk_buff *skb, 
	struct sk_buff *segs = ERR_PTR(-EINVAL);

	struct sk_buff *segs = ERR_PTR(-EINVAL);

	int mac_len = skb->mac_len;

	int mac_len = skb->mac_len;

	int tnl_hlen = skb_inner_mac_header(skb) - skb_transport_header(skb);

	int tnl_hlen = skb_inner_mac_header(skb) - skb_transport_header(skb);

	int outer_hlen, id;

	int outer_hlen;

	struct iphdr *iph;

	netdev_features_t enc_features;

	netdev_features_t enc_features;





	if (unlikely(!pskb_may_pull(skb, tnl_hlen)))

	if (unlikely(!pskb_may_pull(skb, tnl_hlen)))
@@ -2316,8 +2315,6 @@ static struct sk_buff *skb_udp_tunnel_segment(struct sk_buff *skb, 
	skb_reset_mac_header(skb);

	skb_reset_mac_header(skb);

	skb_set_network_header(skb, skb_inner_network_offset(skb));

	skb_set_network_header(skb, skb_inner_network_offset(skb));

	skb->mac_len = skb_inner_network_offset(skb);

	skb->mac_len = skb_inner_network_offset(skb);

	iph = ip_hdr(skb);

	id = ntohs(iph->id);





	/* segment inner packet. */

	/* segment inner packet. */

	enc_features = skb->dev->hw_enc_features & netif_skb_features(skb);

	enc_features = skb->dev->hw_enc_features & netif_skb_features(skb);
@@ -2332,8 +2329,6 @@ static struct sk_buff *skb_udp_tunnel_segment(struct sk_buff *skb, 
		int udp_offset = outer_hlen - tnl_hlen;

		int udp_offset = outer_hlen - tnl_hlen;





		skb->mac_len = mac_len;

		skb->mac_len = mac_len;

		iph = (struct iphdr *)skb_inner_network_header(skb);

		iph->id = htons(id++);





		skb_push(skb, outer_hlen);

		skb_push(skb, outer_hlen);

		skb_reset_mac_header(skb);

		skb_reset_mac_header(skb);