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

Commit 61a1030b authored by Paolo Abeni's avatar Paolo Abeni Committed by David S. Miller
Browse files

Revert "ipv4: keep skb->dst around in presence of IP options" 



ip_options_echo() does not use anymore the skb->dst and don't
need to keep the dst around for options's sake only.
This reverts commit 34b2cef2.

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 91ed1e66

net/ipv4/ip_sockglue.c

+1 −8
Original line number Diff line number Diff line
@@ -1228,13 +1228,6 @@ void ipv4_pktinfo_prepare(const struct sock *sk, struct sk_buff *skb) 
		pktinfo->ipi_ifindex = 0;

		pktinfo->ipi_spec_dst.s_addr = 0;

	}

	/* We need to keep the dst for __ip_options_echo()

	 * We could restrict the test to opt.ts_needtime || opt.srr,

	 * but the following is good enough as IP options are not often used.

	 */

	if (unlikely(IPCB(skb)->opt.optlen))

		skb_dst_force(skb);

	else

	skb_dst_drop(skb);

}