diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-07-16 23:22:25 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-16 23:22:25 -0400 |
commit | 63231bddf6514778792d3784f63822473d250fc0 (patch) | |
tree | d380f9ca00fa0ca2cd74142c5b51b97717ef1e9a /net/ipv6/tcp_ipv6.c | |
parent | 81cc8a75d944fa39fc333c2c329c8e8b3c62cada (diff) |
mib: add net to TCP_INC_STATS_BH
Same as before - the sock is always there to get the net from,
but there are also some places with the net already saved on
the stack.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
-rw-r--r-- | net/ipv6/tcp_ipv6.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index fc5f7166208a..3895d91ea9fa 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
@@ -1004,8 +1004,8 @@ static void tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb) | |||
1004 | 1004 | ||
1005 | if (xfrm_lookup(&buff->dst, &fl, NULL, 0) >= 0) { | 1005 | if (xfrm_lookup(&buff->dst, &fl, NULL, 0) >= 0) { |
1006 | ip6_xmit(ctl_sk, buff, &fl, NULL, 0); | 1006 | ip6_xmit(ctl_sk, buff, &fl, NULL, 0); |
1007 | TCP_INC_STATS_BH(TCP_MIB_OUTSEGS); | 1007 | TCP_INC_STATS_BH(net, TCP_MIB_OUTSEGS); |
1008 | TCP_INC_STATS_BH(TCP_MIB_OUTRSTS); | 1008 | TCP_INC_STATS_BH(net, TCP_MIB_OUTRSTS); |
1009 | return; | 1009 | return; |
1010 | } | 1010 | } |
1011 | } | 1011 | } |
@@ -1089,7 +1089,7 @@ static void tcp_v6_send_ack(struct sk_buff *skb, u32 seq, u32 ack, u32 win, u32 | |||
1089 | if (!ip6_dst_lookup(ctl_sk, &buff->dst, &fl)) { | 1089 | if (!ip6_dst_lookup(ctl_sk, &buff->dst, &fl)) { |
1090 | if (xfrm_lookup(&buff->dst, &fl, NULL, 0) >= 0) { | 1090 | if (xfrm_lookup(&buff->dst, &fl, NULL, 0) >= 0) { |
1091 | ip6_xmit(ctl_sk, buff, &fl, NULL, 0); | 1091 | ip6_xmit(ctl_sk, buff, &fl, NULL, 0); |
1092 | TCP_INC_STATS_BH(TCP_MIB_OUTSEGS); | 1092 | TCP_INC_STATS_BH(net, TCP_MIB_OUTSEGS); |
1093 | return; | 1093 | return; |
1094 | } | 1094 | } |
1095 | } | 1095 | } |
@@ -1579,7 +1579,7 @@ discard: | |||
1579 | kfree_skb(skb); | 1579 | kfree_skb(skb); |
1580 | return 0; | 1580 | return 0; |
1581 | csum_err: | 1581 | csum_err: |
1582 | TCP_INC_STATS_BH(TCP_MIB_INERRS); | 1582 | TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_INERRS); |
1583 | goto discard; | 1583 | goto discard; |
1584 | 1584 | ||
1585 | 1585 | ||
@@ -1625,7 +1625,7 @@ static int tcp_v6_rcv(struct sk_buff *skb) | |||
1625 | /* | 1625 | /* |
1626 | * Count it even if it's bad. | 1626 | * Count it even if it's bad. |
1627 | */ | 1627 | */ |
1628 | TCP_INC_STATS_BH(TCP_MIB_INSEGS); | 1628 | TCP_INC_STATS_BH(net, TCP_MIB_INSEGS); |
1629 | 1629 | ||
1630 | if (!pskb_may_pull(skb, sizeof(struct tcphdr))) | 1630 | if (!pskb_may_pull(skb, sizeof(struct tcphdr))) |
1631 | goto discard_it; | 1631 | goto discard_it; |
@@ -1697,7 +1697,7 @@ no_tcp_socket: | |||
1697 | 1697 | ||
1698 | if (skb->len < (th->doff<<2) || tcp_checksum_complete(skb)) { | 1698 | if (skb->len < (th->doff<<2) || tcp_checksum_complete(skb)) { |
1699 | bad_packet: | 1699 | bad_packet: |
1700 | TCP_INC_STATS_BH(TCP_MIB_INERRS); | 1700 | TCP_INC_STATS_BH(net, TCP_MIB_INERRS); |
1701 | } else { | 1701 | } else { |
1702 | tcp_v6_send_reset(NULL, skb); | 1702 | tcp_v6_send_reset(NULL, skb); |
1703 | } | 1703 | } |
@@ -1722,7 +1722,7 @@ do_time_wait: | |||
1722 | } | 1722 | } |
1723 | 1723 | ||
1724 | if (skb->len < (th->doff<<2) || tcp_checksum_complete(skb)) { | 1724 | if (skb->len < (th->doff<<2) || tcp_checksum_complete(skb)) { |
1725 | TCP_INC_STATS_BH(TCP_MIB_INERRS); | 1725 | TCP_INC_STATS_BH(net, TCP_MIB_INERRS); |
1726 | inet_twsk_put(inet_twsk(sk)); | 1726 | inet_twsk_put(inet_twsk(sk)); |
1727 | goto discard_it; | 1727 | goto discard_it; |
1728 | } | 1728 | } |