diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-07-15 02:03:00 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-15 02:05:29 -0400 |
commit | dcfc23cac103b54dbc00a6f52f47656ad5c75844 (patch) | |
tree | f9a61572791da6c37a50a2d17b73b5f89a6b5fc4 /net/ipv4 | |
parent | 75c939bb4d6da790f758a2a3dcc7432f6d8778ee (diff) |
mib: add struct net to ICMP_INC_STATS_BH
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/icmp.c | 10 | ||||
-rw-r--r-- | net/ipv4/tcp_ipv4.c | 4 | ||||
-rw-r--r-- | net/ipv4/udp.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index e94de411cfa0..56a7bbc7950c 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c | |||
@@ -763,7 +763,7 @@ static void icmp_unreach(struct sk_buff *skb) | |||
763 | out: | 763 | out: |
764 | return; | 764 | return; |
765 | out_err: | 765 | out_err: |
766 | ICMP_INC_STATS_BH(ICMP_MIB_INERRORS); | 766 | ICMP_INC_STATS_BH(net, ICMP_MIB_INERRORS); |
767 | goto out; | 767 | goto out; |
768 | } | 768 | } |
769 | 769 | ||
@@ -803,7 +803,7 @@ static void icmp_redirect(struct sk_buff *skb) | |||
803 | out: | 803 | out: |
804 | return; | 804 | return; |
805 | out_err: | 805 | out_err: |
806 | ICMP_INC_STATS_BH(ICMP_MIB_INERRORS); | 806 | ICMP_INC_STATS_BH(dev_net(skb->dev), ICMP_MIB_INERRORS); |
807 | goto out; | 807 | goto out; |
808 | } | 808 | } |
809 | 809 | ||
@@ -874,7 +874,7 @@ static void icmp_timestamp(struct sk_buff *skb) | |||
874 | out: | 874 | out: |
875 | return; | 875 | return; |
876 | out_err: | 876 | out_err: |
877 | ICMP_INC_STATS_BH(ICMP_MIB_INERRORS); | 877 | ICMP_INC_STATS_BH(dev_net(skb->dst->dev), ICMP_MIB_INERRORS); |
878 | goto out; | 878 | goto out; |
879 | } | 879 | } |
880 | 880 | ||
@@ -994,7 +994,7 @@ int icmp_rcv(struct sk_buff *skb) | |||
994 | skb_set_network_header(skb, nh); | 994 | skb_set_network_header(skb, nh); |
995 | } | 995 | } |
996 | 996 | ||
997 | ICMP_INC_STATS_BH(ICMP_MIB_INMSGS); | 997 | ICMP_INC_STATS_BH(net, ICMP_MIB_INMSGS); |
998 | 998 | ||
999 | switch (skb->ip_summed) { | 999 | switch (skb->ip_summed) { |
1000 | case CHECKSUM_COMPLETE: | 1000 | case CHECKSUM_COMPLETE: |
@@ -1053,7 +1053,7 @@ drop: | |||
1053 | kfree_skb(skb); | 1053 | kfree_skb(skb); |
1054 | return 0; | 1054 | return 0; |
1055 | error: | 1055 | error: |
1056 | ICMP_INC_STATS_BH(ICMP_MIB_INERRORS); | 1056 | ICMP_INC_STATS_BH(net, ICMP_MIB_INERRORS); |
1057 | goto drop; | 1057 | goto drop; |
1058 | } | 1058 | } |
1059 | 1059 | ||
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index ca41b77f3f32..0fefd4409413 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
@@ -346,14 +346,14 @@ void tcp_v4_err(struct sk_buff *skb, u32 info) | |||
346 | struct net *net = dev_net(skb->dev); | 346 | struct net *net = dev_net(skb->dev); |
347 | 347 | ||
348 | if (skb->len < (iph->ihl << 2) + 8) { | 348 | if (skb->len < (iph->ihl << 2) + 8) { |
349 | ICMP_INC_STATS_BH(ICMP_MIB_INERRORS); | 349 | ICMP_INC_STATS_BH(net, ICMP_MIB_INERRORS); |
350 | return; | 350 | return; |
351 | } | 351 | } |
352 | 352 | ||
353 | sk = inet_lookup(net, &tcp_hashinfo, iph->daddr, th->dest, | 353 | sk = inet_lookup(net, &tcp_hashinfo, iph->daddr, th->dest, |
354 | iph->saddr, th->source, inet_iif(skb)); | 354 | iph->saddr, th->source, inet_iif(skb)); |
355 | if (!sk) { | 355 | if (!sk) { |
356 | ICMP_INC_STATS_BH(ICMP_MIB_INERRORS); | 356 | ICMP_INC_STATS_BH(net, ICMP_MIB_INERRORS); |
357 | return; | 357 | return; |
358 | } | 358 | } |
359 | if (sk->sk_state == TCP_TIME_WAIT) { | 359 | if (sk->sk_state == TCP_TIME_WAIT) { |
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 9342cfda3d0a..fdd4faa1f120 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c | |||
@@ -359,7 +359,7 @@ void __udp4_lib_err(struct sk_buff *skb, u32 info, struct hlist_head udptable[]) | |||
359 | sk = __udp4_lib_lookup(net, iph->daddr, uh->dest, | 359 | sk = __udp4_lib_lookup(net, iph->daddr, uh->dest, |
360 | iph->saddr, uh->source, skb->dev->ifindex, udptable); | 360 | iph->saddr, uh->source, skb->dev->ifindex, udptable); |
361 | if (sk == NULL) { | 361 | if (sk == NULL) { |
362 | ICMP_INC_STATS_BH(ICMP_MIB_INERRORS); | 362 | ICMP_INC_STATS_BH(net, ICMP_MIB_INERRORS); |
363 | return; /* No socket for error */ | 363 | return; /* No socket for error */ |
364 | } | 364 | } |
365 | 365 | ||