Merge tag 'ptrace-cleanups-for-v5.18' of git://git.kernel.org/pub/scm/linux/kernel...

[platform/kernel/linux-starfive.git] / net / ipv4 / ip_options.c

diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c
index da1b503..a9e22a0 100644 (file)
--- a/net/ipv4/ip_options.c
+++ b/net/ipv4/ip_options.c
@@ -42,7 +42,7 @@
  */
 
 void ip_options_build(struct sk_buff *skb, struct ip_options *opt,
-                     __be32 daddr, struct rtable *rt, int is_frag)
+                     __be32 daddr, struct rtable *rt)
 {
        unsigned char *iph = skb_network_header(skb);
 
@@ -53,28 +53,15 @@ void ip_options_build(struct sk_buff *skb, struct ip_options *opt,
        if (opt->srr)
                memcpy(iph + opt->srr + iph[opt->srr + 1] - 4, &daddr, 4);
 
-       if (!is_frag) {
-               if (opt->rr_needaddr)
-                       ip_rt_get_source(iph + opt->rr + iph[opt->rr + 2] - 5, skb, rt);
-               if (opt->ts_needaddr)
-                       ip_rt_get_source(iph + opt->ts + iph[opt->ts + 2] - 9, skb, rt);
-               if (opt->ts_needtime) {
-                       __be32 midtime;
+       if (opt->rr_needaddr)
+               ip_rt_get_source(iph + opt->rr + iph[opt->rr + 2] - 5, skb, rt);
+       if (opt->ts_needaddr)
+               ip_rt_get_source(iph + opt->ts + iph[opt->ts + 2] - 9, skb, rt);
+       if (opt->ts_needtime) {
+               __be32 midtime;
 
-                       midtime = inet_current_timestamp();
-                       memcpy(iph + opt->ts + iph[opt->ts + 2] - 5, &midtime, 4);
-               }
-               return;
-       }
-       if (opt->rr) {
-               memset(iph + opt->rr, IPOPT_NOP, iph[opt->rr + 1]);
-               opt->rr = 0;
-               opt->rr_needaddr = 0;
-       }
-       if (opt->ts) {
-               memset(iph + opt->ts, IPOPT_NOP, iph[opt->ts + 1]);
-               opt->ts = 0;
-               opt->ts_needaddr = opt->ts_needtime = 0;
+               midtime = inet_current_timestamp();
+               memcpy(iph + opt->ts + iph[opt->ts + 2] - 5, &midtime, 4);
        }
 }