ipv4: drop fragmentation code from ip_options_build()

Since v2.5.44 and addition of ip_options_fragment()
ip_options_build() does not render headers for fragments
directly. @is_frag is always 0.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/ip.h b/include/net/ip.h
index b51bae43b0ddb00735a09718530aa3fff4a04872..fdbab0c00fca68afcdb2f8191dc4017e083aceff 100644 (file)
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -712,7 +712,7 @@ int ip_forward(struct sk_buff *skb);
  */
 
 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);
 
 int __ip_options_echo(struct net *net, struct ip_options *dopt,
                      struct sk_buff *skb, const struct ip_options *sopt);

diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c
index da1b5038bdfd047e2bacd03bd289a51579bd69f2..a9e22a098872fa3a1a18b5654afc4944dec0ded9 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);
        }
 }
 

diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 139cec29ed06cd092ebdfd2bf0d13aaf67c5359d..0c0574eb5f5bc16d080e94ae31e2bd0244a69e82 100644 (file)
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -179,7 +179,7 @@ int ip_build_and_send_pkt(struct sk_buff *skb, const struct sock *sk,
 
        if (opt && opt->opt.optlen) {
                iph->ihl += opt->opt.optlen>>2;
-               ip_options_build(skb, &opt->opt, daddr, rt, 0);
+               ip_options_build(skb, &opt->opt, daddr, rt);
        }
 
        skb->priority = sk->sk_priority;
@@ -519,7 +519,7 @@ packet_routed:
 
        if (inet_opt && inet_opt->opt.optlen) {
                iph->ihl += inet_opt->opt.optlen >> 2;
-               ip_options_build(skb, &inet_opt->opt, inet->inet_daddr, rt, 0);
+               ip_options_build(skb, &inet_opt->opt, inet->inet_daddr, rt);
        }
 
        ip_select_ident_segs(net, skb, sk,
@@ -1541,7 +1541,7 @@ struct sk_buff *__ip_make_skb(struct sock *sk,
 
        if (opt) {
                iph->ihl += opt->optlen >> 2;
-               ip_options_build(skb, opt, cork->addr, rt, 0);
+               ip_options_build(skb, opt, cork->addr, rt);
        }
 
        skb->priority = (cork->tos != -1) ? cork->priority: sk->sk_priority;