Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa62d76b authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

dccp: rename DCCP_INC_STATS_BH() 



Rename DCCP_INC_STATS_BH() to __DCCP_INC_STATS()

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6aef70a8

net/dccp/dccp.h

+3 −3
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ struct dccp_mib { 


DECLARE_SNMP_STAT(struct dccp_mib, dccp_statistics);

#define DCCP_INC_STATS(field)	SNMP_INC_STATS(dccp_statistics, field)

#define DCCP_INC_STATS_BH(field)    SNMP_INC_STATS_BH(dccp_statistics, field)

#define __DCCP_INC_STATS(field)	SNMP_INC_STATS_BH(dccp_statistics, field)

#define DCCP_DEC_STATS(field)	SNMP_DEC_STATS(dccp_statistics, field)



/*

net/dccp/input.c

+1 −1
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ static int __dccp_rcv_established(struct sock *sk, struct sk_buff *skb, 
		goto discard;

	}



	DCCP_INC_STATS_BH(DCCP_MIB_INERRS);

	__DCCP_INC_STATS(DCCP_MIB_INERRS);

discard:

	__kfree_skb(skb);

	return 0;

net/dccp/ipv4.c

+4 −4
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ static void dccp_v4_err(struct sk_buff *skb, u32 info) 
	case DCCP_REQUESTING:

	case DCCP_RESPOND:

		if (!sock_owned_by_user(sk)) {

			DCCP_INC_STATS_BH(DCCP_MIB_ATTEMPTFAILS);

			__DCCP_INC_STATS(DCCP_MIB_ATTEMPTFAILS);

			sk->sk_err = err;



			sk->sk_error_report(sk);
@@ -533,8 +533,8 @@ static void dccp_v4_ctl_send_reset(const struct sock *sk, struct sk_buff *rxskb) 
	bh_unlock_sock(ctl_sk);



	if (net_xmit_eval(err) == 0) {

		DCCP_INC_STATS_BH(DCCP_MIB_OUTSEGS);

		DCCP_INC_STATS_BH(DCCP_MIB_OUTRSTS);

		__DCCP_INC_STATS(DCCP_MIB_OUTSEGS);

		__DCCP_INC_STATS(DCCP_MIB_OUTRSTS);

	}

out:

	 dst_release(dst);
@@ -637,7 +637,7 @@ int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb) 
drop_and_free:

	reqsk_free(req);

drop:

	DCCP_INC_STATS_BH(DCCP_MIB_ATTEMPTFAILS);

	__DCCP_INC_STATS(DCCP_MIB_ATTEMPTFAILS);

	return -1;

}

EXPORT_SYMBOL_GPL(dccp_v4_conn_request);

net/dccp/ipv6.c

+4 −4
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, 
	case DCCP_RESPOND:  /* Cannot happen.

			       It can, it SYNs are crossed. --ANK */

		if (!sock_owned_by_user(sk)) {

			DCCP_INC_STATS_BH(DCCP_MIB_ATTEMPTFAILS);

			__DCCP_INC_STATS(DCCP_MIB_ATTEMPTFAILS);

			sk->sk_err = err;

			/*

			 * Wake people up to see the error
@@ -277,8 +277,8 @@ static void dccp_v6_ctl_send_reset(const struct sock *sk, struct sk_buff *rxskb) 
	if (!IS_ERR(dst)) {

		skb_dst_set(skb, dst);

		ip6_xmit(ctl_sk, skb, &fl6, NULL, 0);

		DCCP_INC_STATS_BH(DCCP_MIB_OUTSEGS);

		DCCP_INC_STATS_BH(DCCP_MIB_OUTRSTS);

		__DCCP_INC_STATS(DCCP_MIB_OUTSEGS);

		__DCCP_INC_STATS(DCCP_MIB_OUTRSTS);

		return;

	}
@@ -378,7 +378,7 @@ static int dccp_v6_conn_request(struct sock *sk, struct sk_buff *skb) 
drop_and_free:

	reqsk_free(req);

drop:

	DCCP_INC_STATS_BH(DCCP_MIB_ATTEMPTFAILS);

	__DCCP_INC_STATS(DCCP_MIB_ATTEMPTFAILS);

	return -1;

}

net/dccp/minisocks.c

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ struct sock *dccp_create_openreq_child(const struct sock *sk, 
		}

		dccp_init_xmit_timers(newsk);



		DCCP_INC_STATS_BH(DCCP_MIB_PASSIVEOPENS);

		__DCCP_INC_STATS(DCCP_MIB_PASSIVEOPENS);

	}

	return newsk;

}