diff options
| author |   Paolo Abeni <pabeni@redhat.com> | 2017-08-03 18:07:07 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-08-06 20:51:12 -0700 |
| commit | 61a1030bad628f7264cd5e5d0f4d71b5488eb4a4 (patch) | |
| tree | cdf9bc5b1f2d6c240b6afc6c7b35978863ba4f70 | |
| parent | ip/options: explicitly provide net ns to __ip_options_echo() (diff) | |
| download | linux-dev-61a1030bad628f7264cd5e5d0f4d71b5488eb4a4.tar.xz linux-dev-61a1030bad628f7264cd5e5d0f4d71b5488eb4a4.zip | |
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 34b2cef20f19c87999fff3da4071e66937db9644.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv4/ip_sockglue.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c index 1c3354d028a4..dd68a9ed5e40 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c @@ -1228,14 +1228,7 @@ 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); + skb_dst_drop(skb); } int ip_setsockopt(struct sock *sk, int level, |