[NET]: Replace dst_pmtu with dst_mtu

This patch replaces most of the other uses of dst_pmtu with dst_mtu.
As far as I can tell these are either identical because dst->path == dst,
or they're a straightforward replacement of (the slightly incorrect)
dst_pmtu(dst) - dst->header_Len with dst_mtu(dst).

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
index 049a70ea4fd57038dad6dd22b55a23b0d2487805..431378d2eb36f13263d9c562a54ff33638b2b67a 100644 (file)
--- a/net/decnet/af_decnet.c
+++ b/net/decnet/af_decnet.c
@@ -1868,7 +1868,7 @@ static inline unsigned int dn_current_mss(struct sock *sk, int flags)
 
        /* This works out the maximum size of segment we can send out */
        if (dst) {
-               u32 mtu = dst_pmtu(dst);
+               u32 mtu = dst_mtu(dst);
                mss_now = min_t(int, dn_mss_from_pmtu(dst->dev, mtu), mss_now);
        }
 

diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index 8c04f105adf52533061ed7b68bda684338f343cc..1e7b5c3ea2154d94251d04ea0de69fda06f9f58e 100644 (file)
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
@@ -817,7 +817,7 @@ static int dn_rt_set_next_hop(struct dn_route *rt, struct dn_fib_res *res)
        if (rt->u.dst.metrics[RTAX_MTU-1] == 0 || 
             rt->u.dst.metrics[RTAX_MTU-1] > rt->u.dst.dev->mtu)
                rt->u.dst.metrics[RTAX_MTU-1] = rt->u.dst.dev->mtu;
-       mss = dn_mss_from_pmtu(dev, dst_pmtu(&rt->u.dst));
+       mss = dn_mss_from_pmtu(dev, dst_mtu(&rt->u.dst));
        if (rt->u.dst.metrics[RTAX_ADVMSS-1] == 0 ||
            rt->u.dst.metrics[RTAX_ADVMSS-1] > mss)
                rt->u.dst.metrics[RTAX_ADVMSS-1] = mss;

diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index d99cbce25237f56c30c6abe5dd61023d938391d6..a58d5054e176050f746ed34827a0093fc82a4d64 100644 (file)
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -278,7 +278,7 @@ int ip_mc_output(struct sk_buff *skb)
                                newskb->dev, ip_dev_loopback_xmit);
        }
 
-       if (skb->len > dst_pmtu(&rt->u.dst))
+       if (skb->len > dst_mtu(&rt->u.dst))
                return ip_fragment(skb, ip_finish_output);
        else
                return ip_finish_output(skb);
@@ -288,7 +288,7 @@ int ip_output(struct sk_buff *skb)
 {
        IP_INC_STATS(IPSTATS_MIB_OUTREQUESTS);
 
-       if (skb->len > dst_pmtu(skb->dst) && !skb_shinfo(skb)->tso_size)
+       if (skb->len > dst_mtu(skb->dst) && !skb_shinfo(skb)->tso_size)
                return ip_fragment(skb, ip_finish_output);
        else
                return ip_finish_output(skb);
@@ -448,7 +448,7 @@ int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*))
 
        if (unlikely((iph->frag_off & htons(IP_DF)) && !skb->local_df)) {
                icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED,
-                         htonl(dst_pmtu(&rt->u.dst)));
+                         htonl(dst_mtu(&rt->u.dst)));
                kfree_skb(skb);
                return -EMSGSIZE;
        }
@@ -458,7 +458,7 @@ int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*))
         */
 
        hlen = iph->ihl * 4;
-       mtu = dst_pmtu(&rt->u.dst) - hlen;      /* Size of data space */
+       mtu = dst_mtu(&rt->u.dst) - hlen;       /* Size of data space */
 
        /* When frag_list is given, use it. First, check its validity:
         * some transformers could create wrong frag_list or break existing

diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index 48f9cfbcc6a511c86cd9c9424c9a7d0d665e7c7b..47012b93cad2e58c5b28dbdcb899e68006085e79 100644 (file)
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -955,7 +955,7 @@ int ip_getsockopt(struct sock *sk, int level, int optname, char __user *optval,
                        val = 0;
                        dst = sk_dst_get(sk);
                        if (dst) {
-                               val = dst_pmtu(dst) - dst->header_len;
+                               val = dst_mtu(dst);
                                dst_release(dst);
                        }
                        if (!val) {

diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 5bce272a8171268f0ce42bea87ea99826502e8b2..959effc30c5a90667e11a324684b07a9369b8063 100644 (file)
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -147,7 +147,7 @@ static int ip6_output2(struct sk_buff *skb)
 
 int ip6_output(struct sk_buff *skb)
 {
-       if (skb->len > dst_pmtu(skb->dst) || dst_allfrag(skb->dst))
+       if (skb->len > dst_mtu(skb->dst) || dst_allfrag(skb->dst))
                return ip6_fragment(skb, ip6_output2);
        else
                return ip6_output2(skb);
@@ -263,7 +263,7 @@ int ip6_xmit(struct sock *sk, struct sk_buff *skb, struct flowi *fl,
        ipv6_addr_copy(&hdr->saddr, &fl->fl6_src);
        ipv6_addr_copy(&hdr->daddr, first_hop);
 
-       mtu = dst_pmtu(dst);
+       mtu = dst_mtu(dst);
        if ((skb->len <= mtu) || ipfragok) {
                IP6_INC_STATS(IPSTATS_MIB_OUTREQUESTS);
                return NF_HOOK(PF_INET6, NF_IP6_LOCAL_OUT, skb, NULL, dst->dev, ip6_maybe_reroute);
@@ -429,10 +429,10 @@ int ip6_forward(struct sk_buff *skb)
                goto error;
        }
 
-       if (skb->len > dst_pmtu(dst)) {
+       if (skb->len > dst_mtu(dst)) {
                /* Again, force OUTPUT device used as source address */
                skb->dev = dst->dev;
-               icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, dst_pmtu(dst), skb->dev);
+               icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, dst_mtu(dst), skb->dev);
                IP6_INC_STATS_BH(IPSTATS_MIB_INTOOBIGERRORS);
                IP6_INC_STATS_BH(IPSTATS_MIB_FRAGFAILS);
                kfree_skb(skb);
@@ -535,7 +535,7 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))
        hlen = ip6_find_1stfragopt(skb, &prevhdr);
        nexthdr = *prevhdr;
 
-       mtu = dst_pmtu(&rt->u.dst) - hlen - sizeof(struct frag_hdr);
+       mtu = dst_mtu(&rt->u.dst) - hlen - sizeof(struct frag_hdr);
 
        if (skb_shinfo(skb)->frag_list) {
                int first_len = skb_pagelen(skb);

diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index e2d848ab01b0ed7567d9e6eddecd05527a2f766f..732227aa86a9a6fd7ef999fc48bf39c6743e99ed 100644 (file)
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -607,7 +607,7 @@ int ipv6_getsockopt(struct sock *sk, int level, int optname,
                lock_sock(sk);
                dst = sk_dst_get(sk);
                if (dst) {
-                       val = dst_pmtu(dst) - dst->header_len;
+                       val = dst_mtu(dst);
                        dst_release(dst);
                }
                release_sock(sk);

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index ff6978008c119916f61ab42a9b243b86566dbd26..010a04e7c505a5e9ee85096c7f9a4fe4deea90f7 100644 (file)
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -625,7 +625,7 @@ static void ip6_rt_update_pmtu(struct dst_entry *dst, u32 mtu)
 {
        struct rt6_info *rt6 = (struct rt6_info*)dst;
 
-       if (mtu < dst_pmtu(dst) && rt6->rt6i_dst.plen == 128) {
+       if (mtu < dst_mtu(dst) && rt6->rt6i_dst.plen == 128) {
                rt6->rt6i_flags |= RTF_MODIFIED;
                if (mtu < IPV6_MIN_MTU) {
                        mtu = IPV6_MIN_MTU;
@@ -686,7 +686,7 @@ struct dst_entry *ndisc_dst_alloc(struct net_device *dev,
        atomic_set(&rt->u.dst.__refcnt, 1);
        rt->u.dst.metrics[RTAX_HOPLIMIT-1] = 255;
        rt->u.dst.metrics[RTAX_MTU-1] = ipv6_get_mtu(rt->rt6i_dev);
-       rt->u.dst.metrics[RTAX_ADVMSS-1] = ipv6_advmss(dst_pmtu(&rt->u.dst));
+       rt->u.dst.metrics[RTAX_ADVMSS-1] = ipv6_advmss(dst_mtu(&rt->u.dst));
        rt->u.dst.output  = output;
 
 #if 0  /* there's no chance to use these for ndisc */
@@ -971,7 +971,7 @@ install_route:
        if (!rt->u.dst.metrics[RTAX_MTU-1])
                rt->u.dst.metrics[RTAX_MTU-1] = ipv6_get_mtu(dev);
        if (!rt->u.dst.metrics[RTAX_ADVMSS-1])
-               rt->u.dst.metrics[RTAX_ADVMSS-1] = ipv6_advmss(dst_pmtu(&rt->u.dst));
+               rt->u.dst.metrics[RTAX_ADVMSS-1] = ipv6_advmss(dst_mtu(&rt->u.dst));
        rt->u.dst.dev = dev;
        rt->rt6i_idev = idev;
        return ip6_ins_rt(rt, nlh, _rtattr);
@@ -1134,7 +1134,7 @@ source_ok:
        nrt->rt6i_nexthop = neigh_clone(neigh);
        /* Reset pmtu, it may be better */
        nrt->u.dst.metrics[RTAX_MTU-1] = ipv6_get_mtu(neigh->dev);
-       nrt->u.dst.metrics[RTAX_ADVMSS-1] = ipv6_advmss(dst_pmtu(&nrt->u.dst));
+       nrt->u.dst.metrics[RTAX_ADVMSS-1] = ipv6_advmss(dst_mtu(&nrt->u.dst));
 
        if (ip6_ins_rt(nrt, NULL, NULL))
                goto out;
@@ -1164,7 +1164,7 @@ void rt6_pmtu_discovery(struct in6_addr *daddr, struct in6_addr *saddr,
        if (rt == NULL)
                return;
 
-       if (pmtu >= dst_pmtu(&rt->u.dst))
+       if (pmtu >= dst_mtu(&rt->u.dst))
                goto out;
 
        if (pmtu < IPV6_MIN_MTU) {
@@ -1405,7 +1405,7 @@ struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev,
        rt->rt6i_dev = &loopback_dev;
        rt->rt6i_idev = idev;
        rt->u.dst.metrics[RTAX_MTU-1] = ipv6_get_mtu(rt->rt6i_dev);
-       rt->u.dst.metrics[RTAX_ADVMSS-1] = ipv6_advmss(dst_pmtu(&rt->u.dst));
+       rt->u.dst.metrics[RTAX_ADVMSS-1] = ipv6_advmss(dst_mtu(&rt->u.dst));
        rt->u.dst.metrics[RTAX_HOPLIMIT-1] = -1;
        rt->u.dst.obsolete = -1;
 
@@ -1480,9 +1480,9 @@ static int rt6_mtu_change_route(struct rt6_info *rt, void *p_arg)
         */
        if (rt->rt6i_dev == arg->dev &&
            !dst_metric_locked(&rt->u.dst, RTAX_MTU) &&
-            (dst_pmtu(&rt->u.dst) > arg->mtu ||
-             (dst_pmtu(&rt->u.dst) < arg->mtu &&
-             dst_pmtu(&rt->u.dst) == idev->cnf.mtu6)))
+            (dst_mtu(&rt->u.dst) > arg->mtu ||
+             (dst_mtu(&rt->u.dst) < arg->mtu &&
+             dst_mtu(&rt->u.dst) == idev->cnf.mtu6)))
                rt->u.dst.metrics[RTAX_MTU-1] = arg->mtu;
        rt->u.dst.metrics[RTAX_ADVMSS-1] = ipv6_advmss(arg->mtu);
        return 0;

diff --git a/net/sctp/transport.c b/net/sctp/transport.c
index 0e0c0f8f191180dbd29ff030c618dbcf79d4d2ae..f30882e1e96acc3f99012b77a11d1238b39aa2f0 100644 (file)
--- a/net/sctp/transport.c
+++ b/net/sctp/transport.c
@@ -227,7 +227,7 @@ void sctp_transport_pmtu(struct sctp_transport *transport)
        dst = transport->af_specific->get_dst(NULL, &transport->ipaddr, NULL);
 
        if (dst) {
-               transport->pmtu = dst_pmtu(dst);
+               transport->pmtu = dst_mtu(dst);
                dst_release(dst);
        } else
                transport->pmtu = SCTP_DEFAULT_MAXSEGMENT;
@@ -253,7 +253,7 @@ void sctp_transport_route(struct sctp_transport *transport,
 
        transport->dst = dst;
        if (dst) {
-               transport->pmtu = dst_pmtu(dst);
+               transport->pmtu = dst_mtu(dst);
 
                /* Initialize sk->sk_rcv_saddr, if the transport is the
                 * association's active path for getsockname().

diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index ba20291c6bbd7cdbcf1950ff2d5f2a237cf0f395..83270094a95f525b7ccf67466893b663c415e3b2 100644 (file)
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -1119,12 +1119,12 @@ void xfrm_init_pmtu(struct dst_entry *dst)
                struct xfrm_dst *xdst = (struct xfrm_dst *)dst;
                u32 pmtu, route_mtu_cached;
 
-               pmtu = dst_pmtu(dst->child);
+               pmtu = dst_mtu(dst->child);
                xdst->child_mtu_cached = pmtu;
 
                pmtu = xfrm_state_mtu(dst->xfrm, pmtu);
 
-               route_mtu_cached = dst_pmtu(xdst->route);
+               route_mtu_cached = dst_mtu(xdst->route);
                xdst->route_mtu_cached = route_mtu_cached;
 
                if (pmtu > route_mtu_cached)
@@ -1160,7 +1160,7 @@ int xfrm_bundle_ok(struct xfrm_dst *first, struct flowi *fl, int family)
                if (dst->xfrm->km.state != XFRM_STATE_VALID)
                        return 0;
 
-               mtu = dst_pmtu(dst->child);
+               mtu = dst_mtu(dst->child);
                if (xdst->child_mtu_cached != mtu) {
                        last = xdst;
                        xdst->child_mtu_cached = mtu;
@@ -1168,7 +1168,7 @@ int xfrm_bundle_ok(struct xfrm_dst *first, struct flowi *fl, int family)
 
                if (!dst_check(xdst->route, 0))
                        return 0;
-               mtu = dst_pmtu(xdst->route);
+               mtu = dst_mtu(xdst->route);
                if (xdst->route_mtu_cached != mtu) {
                        last = xdst;
                        xdst->route_mtu_cached = mtu;