diff options
| author | David S. Miller <davem@davemloft.net> | 2017-02-08 00:29:30 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-08 00:29:30 +0300 |
| commit | 3efa70d78f218e4c9276b0bac0545e5184c1c47b (patch) | |
| tree | f4abe2f05e173023d2a262afd4aebb1e89fe6985 /net/ipv4/ip_sockglue.c | |
| parent | 76e0e70e6452b971a69cc9794ff4a6715c11f7f2 (diff) | |
| parent | 926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff) | |
| download | linux-3efa70d78f218e4c9276b0bac0545e5184c1c47b.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the
netvsc driver in 'net' and an optimization of the RX path
in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_sockglue.c')
| -rw-r--r-- | net/ipv4/ip_sockglue.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c index 8a4409dd390a..ce1386a67e24 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c @@ -1243,7 +1243,14 @@ void ipv4_pktinfo_prepare(const struct sock *sk, struct sk_buff *skb) pktinfo->ipi_ifindex = 0; pktinfo->ipi_spec_dst.s_addr = 0; } - skb_dst_drop(skb); + /* 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); } int ip_setsockopt(struct sock *sk, int level, |