Commit 8e5443d2 authored by Denis Kirjanov's avatar Denis Kirjanov Committed by David S. Miller
Browse files

net: remove SOCK_DEBUG leftovers 



SOCK_DEBUG comes from the old days. Let's
move logging to standard net core ratelimited logging functions

Signed-off-by: default avatarDenis Kirjanov <dkirjanov@suse.de>

changes in v2:
 - remove SOCK_DEBUG macro altogether

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e3eb47f2

net/appletalk/ddp.c

+8 −8
Original line number Diff line number Diff line
@@ -1581,7 +1581,7 @@ static int atalk_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) 
	}



	/* Build a packet */

	SOCK_DEBUG(sk, "SK %p: Got address.\n", sk);

	net_dbg_ratelimited("SK %p: Got address.\n", sk);



	/* For headers */

	size = sizeof(struct ddpehdr) + len + ddp_dl->header_length;
@@ -1602,7 +1602,7 @@ static int atalk_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) 


	dev = rt->dev;



	SOCK_DEBUG(sk, "SK %p: Size needed %d, device %s\n",

	net_dbg_ratelimited("SK %p: Size needed %d, device %s\n",

			sk, size, dev->name);



	hard_header_len = dev->hard_header_len;
@@ -1631,7 +1631,7 @@ static int atalk_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) 
	skb_reserve(skb, hard_header_len);

	skb->dev = dev;



	SOCK_DEBUG(sk, "SK %p: Begin build.\n", sk);

	net_dbg_ratelimited("SK %p: Begin build.\n", sk);



	ddp = skb_put(skb, sizeof(struct ddpehdr));

	ddp->deh_len_hops  = htons(len + sizeof(*ddp));
@@ -1642,7 +1642,7 @@ static int atalk_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) 
	ddp->deh_dport = usat->sat_port;

	ddp->deh_sport = at->src_port;



	SOCK_DEBUG(sk, "SK %p: Copy user data (%zd bytes).\n", sk, len);

	net_dbg_ratelimited("SK %p: Copy user data (%zd bytes).\n", sk, len);



	err = memcpy_from_msg(skb_put(skb, len), msg, len);

	if (err) {
@@ -1666,7 +1666,7 @@ static int atalk_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) 


		if (skb2) {

			loopback = 1;

			SOCK_DEBUG(sk, "SK %p: send out(copy).\n", sk);

			net_dbg_ratelimited("SK %p: send out(copy).\n", sk);

			/*

			 * If it fails it is queued/sent above in the aarp queue

			 */
@@ -1675,7 +1675,7 @@ static int atalk_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) 
	}



	if (dev->flags & IFF_LOOPBACK || loopback) {

		SOCK_DEBUG(sk, "SK %p: Loop back.\n", sk);

		net_dbg_ratelimited("SK %p: Loop back.\n", sk);

		/* loop back */

		skb_orphan(skb);

		if (ddp->deh_dnode == ATADDR_BCAST) {
@@ -1689,7 +1689,7 @@ static int atalk_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) 
		}

		ddp_dl->request(ddp_dl, skb, dev->dev_addr);

	} else {

		SOCK_DEBUG(sk, "SK %p: send out.\n", sk);

		net_dbg_ratelimited("SK %p: send out.\n", sk);

		if (rt->flags & RTF_GATEWAY) {

		    gsat.sat_addr = rt->gateway;

		    usat = &gsat;
@@ -1700,7 +1700,7 @@ static int atalk_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) 
		 */

		aarp_send_ddp(dev, skb, &usat->sat_addr, NULL);

	}

	SOCK_DEBUG(sk, "SK %p: Done write (%zd).\n", sk, len);

	net_dbg_ratelimited("SK %p: Done write (%zd).\n", sk, len);



out:

	release_sock(sk);

net/dccp/ipv6.c

+1 −1
Original line number Diff line number Diff line
@@ -889,7 +889,7 @@ static int dccp_v6_connect(struct sock *sk, struct sockaddr *uaddr, 
		u32 exthdrlen = icsk->icsk_ext_hdr_len;

		struct sockaddr_in sin;



		SOCK_DEBUG(sk, "connect: ipv4 mapped\n");

		net_dbg_ratelimited("connect: ipv4 mapped\n");



		if (ipv6_only_sock(sk))

			return -ENETUNREACH;

net/x25/af_x25.c

+7 −7
Original line number Diff line number Diff line
@@ -704,7 +704,7 @@ static int x25_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) 
		rc = -EINVAL;

	}

	release_sock(sk);

	SOCK_DEBUG(sk, "x25_bind: socket is bound\n");

	net_dbg_ratelimited("x25_bind: socket is bound\n");

out:

	return rc;

}
@@ -1165,10 +1165,10 @@ static int x25_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) 
		goto out;

	}



	SOCK_DEBUG(sk, "x25_sendmsg: sendto: Addresses built.\n");

	net_dbg_ratelimited("x25_sendmsg: sendto: Addresses built.\n");



	/* Build a packet */

	SOCK_DEBUG(sk, "x25_sendmsg: sendto: building packet.\n");

	net_dbg_ratelimited("x25_sendmsg: sendto: building packet.\n");



	if ((msg->msg_flags & MSG_OOB) && len > 32)

		len = 32;
@@ -1187,7 +1187,7 @@ static int x25_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) 
	/*

	 *	Put the data on the end

	 */

	SOCK_DEBUG(sk, "x25_sendmsg: Copying user data\n");

	net_dbg_ratelimited("x25_sendmsg: Copying user data\n");



	skb_reset_transport_header(skb);

	skb_put(skb, len);
@@ -1211,7 +1211,7 @@ static int x25_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) 
	/*

	 *	Push down the X.25 header

	 */

	SOCK_DEBUG(sk, "x25_sendmsg: Building X.25 Header.\n");

	net_dbg_ratelimited("x25_sendmsg: Building X.25 Header.\n");



	if (msg->msg_flags & MSG_OOB) {

		if (x25->neighbour->extended) {
@@ -1245,8 +1245,8 @@ static int x25_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) 
			skb->data[0] |= X25_Q_BIT;

	}



	SOCK_DEBUG(sk, "x25_sendmsg: Built header.\n");

	SOCK_DEBUG(sk, "x25_sendmsg: Transmitting buffer\n");

	net_dbg_ratelimited("x25_sendmsg: Built header.\n");

	net_dbg_ratelimited("x25_sendmsg: Transmitting buffer\n");



	rc = -ENOTCONN;

	if (sk->sk_state != TCP_ESTABLISHED)

net/x25/x25_facilities.c

+7 −7
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ int x25_negotiate_facilities(struct sk_buff *skb, struct sock *sk, 
	 *	They want reverse charging, we won't accept it.

	 */

	if ((theirs.reverse & 0x01 ) && (ours->reverse & 0x01)) {

		SOCK_DEBUG(sk, "X.25: rejecting reverse charging request\n");

		net_dbg_ratelimited("X.25: rejecting reverse charging request\n");

		return -1;

	}
@@ -294,11 +294,11 @@ int x25_negotiate_facilities(struct sk_buff *skb, struct sock *sk, 
		int ours_in  = ours->throughput & 0x0f;

		int ours_out = ours->throughput & 0xf0;

		if (!ours_in || theirs_in < ours_in) {

			SOCK_DEBUG(sk, "X.25: inbound throughput negotiated\n");

			net_dbg_ratelimited("X.25: inbound throughput negotiated\n");

			new->throughput = (new->throughput & 0xf0) | theirs_in;

		}

		if (!ours_out || theirs_out < ours_out) {

			SOCK_DEBUG(sk,

			net_dbg_ratelimited(

				"X.25: outbound throughput negotiated\n");

			new->throughput = (new->throughput & 0x0f) | theirs_out;

		}
@@ -306,22 +306,22 @@ int x25_negotiate_facilities(struct sk_buff *skb, struct sock *sk, 


	if (theirs.pacsize_in && theirs.pacsize_out) {

		if (theirs.pacsize_in < ours->pacsize_in) {

			SOCK_DEBUG(sk, "X.25: packet size inwards negotiated down\n");

			net_dbg_ratelimited("X.25: packet size inwards negotiated down\n");

			new->pacsize_in = theirs.pacsize_in;

		}

		if (theirs.pacsize_out < ours->pacsize_out) {

			SOCK_DEBUG(sk, "X.25: packet size outwards negotiated down\n");

			net_dbg_ratelimited("X.25: packet size outwards negotiated down\n");

			new->pacsize_out = theirs.pacsize_out;

		}

	}



	if (theirs.winsize_in && theirs.winsize_out) {

		if (theirs.winsize_in < ours->winsize_in) {

			SOCK_DEBUG(sk, "X.25: window size inwards negotiated down\n");

			net_dbg_ratelimited("X.25: window size inwards negotiated down\n");

			new->winsize_in = theirs.winsize_in;

		}

		if (theirs.winsize_out < ours->winsize_out) {

			SOCK_DEBUG(sk, "X.25: window size outwards negotiated down\n");

			net_dbg_ratelimited("X.25: window size outwards negotiated down\n");

			new->winsize_out = theirs.winsize_out;

		}

	}

net/x25/x25_out.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ int x25_output(struct sock *sk, struct sk_buff *skb) 
					kfree_skb(skb);

					return sent;

				}

				SOCK_DEBUG(sk, "x25_output: fragment alloc"

				net_dbg_ratelimited("x25_output: fragment alloc"

					       " failed, err=%d, %d bytes "

					       "sent\n", err, sent);

				return err;