net: Remove unused parameter from fill method in fib_rules_ops.

[linux-2.6-block.git] / net / ipv4 / ip_input.c

diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
index cfb38ac9d698b933cc64a5cd5dbb42298ba07056..40f6206b2aa96699300b6c1d33d8b975b451432f 100644 (file)
--- a/net/ipv4/ip_input.c
+++ b/net/ipv4/ip_input.c
@@ -302,10 +302,8 @@ static inline int ip_rcv_options(struct sk_buff *skb)
                        if (!IN_DEV_SOURCE_ROUTE(in_dev)) {
                                if (IN_DEV_LOG_MARTIANS(in_dev) &&
                                    net_ratelimit())
-                                       printk(KERN_INFO "source route option "
-                                              NIPQUAD_FMT " -> " NIPQUAD_FMT "\n",
-                                              NIPQUAD(iph->saddr),
-                                              NIPQUAD(iph->daddr));
+                                       printk(KERN_INFO "source route option %pI4 -> %pI4\n",
+                                              &iph->saddr, &iph->daddr);
                                in_dev_put(in_dev);
                                goto drop;
                        }
@@ -350,9 +348,9 @@ static int ip_rcv_finish(struct sk_buff *skb)
                struct ip_rt_acct *st = per_cpu_ptr(ip_rt_acct, smp_processor_id());
                u32 idx = skb->dst->tclassid;
                st[idx&0xFF].o_packets++;
-               st[idx&0xFF].o_bytes+=skb->len;
+               st[idx&0xFF].o_bytes += skb->len;
                st[(idx>>16)&0xFF].i_packets++;
-               st[(idx>>16)&0xFF].i_bytes+=skb->len;
+               st[(idx>>16)&0xFF].i_bytes += skb->len;
        }
 #endif
 
@@ -360,10 +358,12 @@ static int ip_rcv_finish(struct sk_buff *skb)
                goto drop;
 
        rt = skb->rtable;
-       if (rt->rt_type == RTN_MULTICAST)
-               IP_INC_STATS_BH(dev_net(rt->u.dst.dev), IPSTATS_MIB_INMCASTPKTS);
-       else if (rt->rt_type == RTN_BROADCAST)
-               IP_INC_STATS_BH(dev_net(rt->u.dst.dev), IPSTATS_MIB_INBCASTPKTS);
+       if (rt->rt_type == RTN_MULTICAST) {
+               IP_UPD_PO_STATS_BH(dev_net(rt->u.dst.dev), IPSTATS_MIB_INMCAST,
+                               skb->len);
+       } else if (rt->rt_type == RTN_BROADCAST)
+               IP_UPD_PO_STATS_BH(dev_net(rt->u.dst.dev), IPSTATS_MIB_INBCAST,
+                               skb->len);
 
        return dst_input(skb);
 
@@ -386,7 +386,8 @@ int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt,
        if (skb->pkt_type == PACKET_OTHERHOST)
                goto drop;
 
-       IP_INC_STATS_BH(dev_net(dev), IPSTATS_MIB_INRECEIVES);
+
+       IP_UPD_PO_STATS_BH(dev_net(dev), IPSTATS_MIB_IN, skb->len);
 
        if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) {
                IP_INC_STATS_BH(dev_net(dev), IPSTATS_MIB_INDISCARDS);