mib: add net to IP_INC_STATS

[net-next-2.6.git] / net / ipv4 / ip_forward.c

diff --git a/net/ipv4/ip_forward.c b/net/ipv4/ip_forward.c
index a4506c8cfef0a9b7788909375f31effa8a505c89..7f78a5a7e1e74801ff10f74cf906a43c32c59508 100644 (file)
--- a/net/ipv4/ip_forward.c
+++ b/net/ipv4/ip_forward.c
@@ -5,8 +5,6 @@
  *
  *             The IP forwarding functionality.
  *
- * Version:    $Id: ip_forward.c,v 1.48 2000/12/13 18:31:48 davem Exp $
- *
  * Authors:    see ip.c
  *
  * Fixes:
@@ -58,6 +56,9 @@ int ip_forward(struct sk_buff *skb)
        struct rtable *rt;      /* Route we use */
        struct ip_options * opt = &(IPCB(skb)->opt);
 
+       if (skb_warn_if_lro(skb))
+               goto drop;
+
        if (!xfrm4_policy_check(NULL, XFRM_POLICY_FWD, skb))
                goto drop;
 
@@ -80,14 +81,14 @@ int ip_forward(struct sk_buff *skb)
        if (!xfrm4_route_forward(skb))
                goto drop;
 
-       rt = (struct rtable*)skb->dst;
+       rt = skb->rtable;
 
        if (opt->is_strictroute && rt->rt_dst != rt->rt_gateway)
                goto sr_failed;
 
        if (unlikely(skb->len > dst_mtu(&rt->u.dst) && !skb_is_gso(skb) &&
                     (ip_hdr(skb)->frag_off & htons(IP_DF))) && !skb->local_df) {
-               IP_INC_STATS(IPSTATS_MIB_FRAGFAILS);
+               IP_INC_STATS(dev_net(rt->u.dst.dev), IPSTATS_MIB_FRAGFAILS);
                icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED,
                          htonl(dst_mtu(&rt->u.dst)));
                goto drop;