Skip to content

Commit

Permalink
mib: add struct net to ICMP_INC_STATS_BH
Browse files Browse the repository at this point in the history 
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Pavel Emelyanov authored and David S. Miller committed Jul 15, 2008
1 parent 75c939b commit dcfc23c
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 13 deletions.
2 changes: 1 addition & 1 deletion include/net/icmp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ extern struct icmp_err icmp_err_convert[];
DECLARE_SNMP_STAT(struct icmp_mib, icmp_statistics);
DECLARE_SNMP_STAT(struct icmpmsg_mib, icmpmsg_statistics);
#define ICMP_INC_STATS(net, field) SNMP_INC_STATS(icmp_statistics, field)
#define ICMP_INC_STATS_BH(field) SNMP_INC_STATS_BH(icmp_statistics, field)
#define ICMP_INC_STATS_BH(net, field) SNMP_INC_STATS_BH(icmp_statistics, field)
#define ICMPMSGOUT_INC_STATS(field) SNMP_INC_STATS(icmpmsg_statistics, field+256)
#define ICMPMSGIN_INC_STATS_BH(field) SNMP_INC_STATS_BH(icmpmsg_statistics, field)

Expand Down
4 changes: 2 additions & 2 deletions net/dccp/ipv4.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,15 +208,15 @@ static void dccp_v4_err(struct sk_buff *skb, u32 info)
struct net *net = dev_net(skb->dev);

if (skb->len < (iph->ihl << 2) + 8) {
ICMP_INC_STATS_BH(ICMP_MIB_INERRORS);
ICMP_INC_STATS_BH(net, ICMP_MIB_INERRORS);
return;
}

sk = inet_lookup(net, &dccp_hashinfo,
iph->daddr, dh->dccph_dport,
iph->saddr, dh->dccph_sport, inet_iif(skb));
if (sk == NULL) {
ICMP_INC_STATS_BH(ICMP_MIB_INERRORS);
ICMP_INC_STATS_BH(net, ICMP_MIB_INERRORS);
return;
}

Expand Down
10 changes: 5 additions & 5 deletions net/ipv4/icmp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,7 @@ static void icmp_unreach(struct sk_buff *skb)
out:
return;
out_err:
ICMP_INC_STATS_BH(ICMP_MIB_INERRORS);
ICMP_INC_STATS_BH(net, ICMP_MIB_INERRORS);
goto out;
}

Expand Down Expand Up @@ -803,7 +803,7 @@ static void icmp_redirect(struct sk_buff *skb)
out:
return;
out_err:
ICMP_INC_STATS_BH(ICMP_MIB_INERRORS);
ICMP_INC_STATS_BH(dev_net(skb->dev), ICMP_MIB_INERRORS);
goto out;
}

Expand Down Expand Up @@ -874,7 +874,7 @@ static void icmp_timestamp(struct sk_buff *skb)
out:
return;
out_err:
ICMP_INC_STATS_BH(ICMP_MIB_INERRORS);
ICMP_INC_STATS_BH(dev_net(skb->dst->dev), ICMP_MIB_INERRORS);
goto out;
}

Expand Down Expand Up @@ -994,7 +994,7 @@ int icmp_rcv(struct sk_buff *skb)
skb_set_network_header(skb, nh);
}

ICMP_INC_STATS_BH(ICMP_MIB_INMSGS);
ICMP_INC_STATS_BH(net, ICMP_MIB_INMSGS);

switch (skb->ip_summed) {
case CHECKSUM_COMPLETE:
Expand Down Expand Up @@ -1053,7 +1053,7 @@ int icmp_rcv(struct sk_buff *skb)
kfree_skb(skb);
return 0;
error:
ICMP_INC_STATS_BH(ICMP_MIB_INERRORS);
ICMP_INC_STATS_BH(net, ICMP_MIB_INERRORS);
goto drop;
}

Expand Down
4 changes: 2 additions & 2 deletions net/ipv4/tcp_ipv4.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -346,14 +346,14 @@ void tcp_v4_err(struct sk_buff *skb, u32 info)
struct net *net = dev_net(skb->dev);

if (skb->len < (iph->ihl << 2) + 8) {
ICMP_INC_STATS_BH(ICMP_MIB_INERRORS);
ICMP_INC_STATS_BH(net, ICMP_MIB_INERRORS);
return;
}

sk = inet_lookup(net, &tcp_hashinfo, iph->daddr, th->dest,
iph->saddr, th->source, inet_iif(skb));
if (!sk) {
ICMP_INC_STATS_BH(ICMP_MIB_INERRORS);
ICMP_INC_STATS_BH(net, ICMP_MIB_INERRORS);
return;
}
if (sk->sk_state == TCP_TIME_WAIT) {
Expand Down
2 changes: 1 addition & 1 deletion net/ipv4/udp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ void __udp4_lib_err(struct sk_buff *skb, u32 info, struct hlist_head udptable[])
sk = __udp4_lib_lookup(net, iph->daddr, uh->dest,
iph->saddr, uh->source, skb->dev->ifindex, udptable);
if (sk == NULL) {
ICMP_INC_STATS_BH(ICMP_MIB_INERRORS);
ICMP_INC_STATS_BH(net, ICMP_MIB_INERRORS);
return; /* No socket for error */
}

Expand Down
5 changes: 3 additions & 2 deletions net/sctp/input.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
#include <net/sctp/sctp.h>
#include <net/sctp/sm.h>
#include <net/sctp/checksum.h>
#include <net/net_namespace.h>

/* Forward declarations for internal helpers. */
static int sctp_rcv_ootb(struct sk_buff *);
Expand Down Expand Up @@ -534,7 +535,7 @@ void sctp_v4_err(struct sk_buff *skb, __u32 info)
int err;

if (skb->len < ihlen + 8) {
ICMP_INC_STATS_BH(ICMP_MIB_INERRORS);
ICMP_INC_STATS_BH(&init_net, ICMP_MIB_INERRORS);
return;
}

Expand All @@ -548,7 +549,7 @@ void sctp_v4_err(struct sk_buff *skb, __u32 info)
skb->network_header = saveip;
skb->transport_header = savesctp;
if (!sk) {
ICMP_INC_STATS_BH(ICMP_MIB_INERRORS);
ICMP_INC_STATS_BH(&init_net, ICMP_MIB_INERRORS);
return;
}
/* Warning: The sock lock is held. Remember to call
Expand Down

0 comments on commit dcfc23c

Please sign in to comment.