ipv4: remove rt_cache_rebuild_count

[platform/adaptation/renesas_rcar/renesas_kernel.git] / net / ipv4 / ip_options.c

diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c
index 766dfe5..1dc01f9 100644 (file)
--- a/net/ipv4/ip_options.c
+++ b/net/ipv4/ip_options.c
@@ -93,7 +93,6 @@ int ip_options_echo(struct ip_options *dopt, struct sk_buff *skb)
        unsigned char *sptr, *dptr;
        int soffset, doffset;
        int     optlen;
-       __be32  daddr;
 
        memset(dopt, 0, sizeof(struct ip_options));
 
@@ -105,8 +104,6 @@ int ip_options_echo(struct ip_options *dopt, struct sk_buff *skb)
        sptr = skb_network_header(skb);
        dptr = dopt->__data;
 
-       daddr = fib_compute_spec_dst(skb);
-
        if (sopt->rr) {
                optlen  = sptr[sopt->rr+1];
                soffset = sptr[sopt->rr+2];
@@ -180,6 +177,8 @@ int ip_options_echo(struct ip_options *dopt, struct sk_buff *skb)
                                doffset -= 4;
                }
                if (doffset > 3) {
+                       __be32 daddr = fib_compute_spec_dst(skb);
+
                        memcpy(&start[doffset-1], &daddr, 4);
                        dopt->faddr = faddr;
                        dptr[0] = start[0];
@@ -242,6 +241,15 @@ void ip_options_fragment(struct sk_buff *skb)
        opt->ts_needtime = 0;
 }
 
+/* helper used by ip_options_compile() to call fib_compute_spec_dst()
+ * at most one time.
+ */
+static void spec_dst_fill(__be32 *spec_dst, struct sk_buff *skb)
+{
+       if (*spec_dst == htonl(INADDR_ANY))
+               *spec_dst = fib_compute_spec_dst(skb);
+}
+
 /*
  * Verify options and fill pointers in struct options.
  * Caller should clear *opt, and set opt->data.
@@ -251,14 +259,15 @@ void ip_options_fragment(struct sk_buff *skb)
 int ip_options_compile(struct net *net,
                       struct ip_options *opt, struct sk_buff *skb)
 {
-       __be32 spec_dst = (__force __be32) 0;
+       __be32 spec_dst = htonl(INADDR_ANY);
        unsigned char *pp_ptr = NULL;
+       struct rtable *rt = NULL;
        unsigned char *optptr;
        unsigned char *iph;
        int optlen, l;
 
        if (skb != NULL) {
-               spec_dst = fib_compute_spec_dst(skb);
+               rt = skb_rtable(skb);
                optptr = (unsigned char *)&(ip_hdr(skb)[1]);
        } else
                optptr = opt->__data;
@@ -330,7 +339,8 @@ int ip_options_compile(struct net *net,
                                        pp_ptr = optptr + 2;
                                        goto error;
                                }
-                               if (skb) {
+                               if (rt) {
+                                       spec_dst_fill(&spec_dst, skb);
                                        memcpy(&optptr[optptr[2]-1], &spec_dst, 4);
                                        opt->is_changed = 1;
                                }
@@ -372,7 +382,8 @@ int ip_options_compile(struct net *net,
                                                goto error;
                                        }
                                        opt->ts = optptr - iph;
-                                       if (skb)  {
+                                       if (rt)  {
+                                               spec_dst_fill(&spec_dst, skb);
                                                memcpy(&optptr[optptr[2]-1], &spec_dst, 4);
                                                timeptr = &optptr[optptr[2]+3];
                                        }