aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/ip_input.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4/ip_input.c')
-rw-r--r--net/ipv4/ip_input.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
index cfb38ac9d698..1a58a6fa1dc0 100644
--- 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)
302 if (!IN_DEV_SOURCE_ROUTE(in_dev)) { 302 if (!IN_DEV_SOURCE_ROUTE(in_dev)) {
303 if (IN_DEV_LOG_MARTIANS(in_dev) && 303 if (IN_DEV_LOG_MARTIANS(in_dev) &&
304 net_ratelimit()) 304 net_ratelimit())
305 printk(KERN_INFO "source route option " 305 printk(KERN_INFO "source route option %pI4 -> %pI4\n",
306 NIPQUAD_FMT " -> " NIPQUAD_FMT "\n", 306 &iph->saddr, &iph->daddr);
307 NIPQUAD(iph->saddr),
308 NIPQUAD(iph->daddr));
309 in_dev_put(in_dev); 307 in_dev_put(in_dev);
310 goto drop; 308 goto drop;
311 } 309 }
@@ -350,9 +348,9 @@ static int ip_rcv_finish(struct sk_buff *skb)
350 struct ip_rt_acct *st = per_cpu_ptr(ip_rt_acct, smp_processor_id()); 348 struct ip_rt_acct *st = per_cpu_ptr(ip_rt_acct, smp_processor_id());
351 u32 idx = skb->dst->tclassid; 349 u32 idx = skb->dst->tclassid;
352 st[idx&0xFF].o_packets++; 350 st[idx&0xFF].o_packets++;
353 st[idx&0xFF].o_bytes+=skb->len; 351 st[idx&0xFF].o_bytes += skb->len;
354 st[(idx>>16)&0xFF].i_packets++; 352 st[(idx>>16)&0xFF].i_packets++;
355 st[(idx>>16)&0xFF].i_bytes+=skb->len; 353 st[(idx>>16)&0xFF].i_bytes += skb->len;
356 } 354 }
357#endif 355#endif
358 356