[PATCH] compile fixes

diff --git a/net/ipv4/netfilter/ip_conntrack_standalone.c b/net/ipv4/netfilter/ip_conntrack_standalone.c
index 9cebe6d8501a519aa0b5c39945edd209b266d9e1..49a48317f8ea710f25385f904c430da50591c3bf 100644 (file)
--- a/net/ipv4/netfilter/ip_conntrack_standalone.c
+++ b/net/ipv4/netfilter/ip_conntrack_standalone.c
@@ -201,7 +201,7 @@ static unsigned int ip_refrag(unsigned int hooknum,
        /* Local packets are never produced too large for their
           interface.  We degfragment them at LOCAL_OUT, however,
           so we have to refragment them here. */
-       if ((*pskb)->len > rt->u.dst.pmtu) {
+       if ((*pskb)->len > dst_pmtu(&rt->u.dst)) {
                /* No hook can be after us, so this should be OK. */
                ip_fragment(*pskb, okfn);
                return NF_STOLEN;

diff --git a/net/ipv4/netfilter/ipt_REJECT.c b/net/ipv4/netfilter/ipt_REJECT.c
index 8a444327ae9bb663250f272fadb4bff9c256099d..10c1690a27172f948bf2408e8a5adff8d4521513 100644 (file)
--- a/net/ipv4/netfilter/ipt_REJECT.c
+++ b/net/ipv4/netfilter/ipt_REJECT.c
@@ -148,7 +148,7 @@ static void send_reset(struct sk_buff *oldskb, int local)
        nskb->dst = &rt->u.dst;
 
        /* "Never happens" */
-       if (nskb->len > nskb->dst->pmtu)
+       if (nskb->len > dst_pmtu(nskb->dst))
                goto free_nskb;
 
        connection_attach(nskb, oldskb->nfct);
@@ -225,8 +225,8 @@ static void send_unreach(struct sk_buff *skb_in, int code)
        /* RFC says return as much as we can without exceeding 576 bytes. */
        length = skb_in->len + sizeof(struct iphdr) + sizeof(struct icmphdr);
 
-       if (length > rt->u.dst.pmtu)
-               length = rt->u.dst.pmtu;
+       if (length > dst_pmtu(&rt->u.dst))
+               length = dst_pmtu(&rt->u.dst);
        if (length > 576)
                length = 576;
 

diff --git a/net/ipv4/syncookies.c b/net/ipv4/syncookies.c
index 06698942386923f9e098d92ca447ec1ab601f484..ae6ac63877b335a8d0e636b3cadc4185ccaad1c6 100644 (file)
--- a/net/ipv4/syncookies.c
+++ b/net/ipv4/syncookies.c
@@ -189,7 +189,7 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb,
        }
 
        /* Try to redo what tcp_v4_send_synack did. */
-       req->window_clamp = rt->u.dst.window;  
+       req->window_clamp = dst_metric(&rt->u.dst, RTAX_WINDOW);
        tcp_select_initial_window(tcp_full_space(sk), req->mss,
                                  &req->rcv_wnd, &req->window_clamp, 
                                  0, &rcv_wscale);