NET: AX.25, NETROM, ROSE: Remove SOCK_DEBUG calls

Nobody alive seems to recall when they last were useful. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: David S. Miller <davem@davemloft.net>

NET: AX.25, NETROM, ROSE: Remove SOCK_DEBUG calls
Nobody alive seems to recall when they last were useful. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Ralf Baechle · David S. Miller
1 parent 45a5f720fe
Showing 3 changed files with 4 additions and 40 deletions Side-by-side Diff
net/ax25/af_ax25.c
net/netrom/af_netrom.c
net/rose/af_rose.c
@@ -1538,8 +1538,6 @@
 	}
  
 	/* Build a packet */
-	SOCK_DEBUG(sk, "AX.25: sendto: Addresses built. Building packet.\n");
-
 	/* Assume the worst case */
 	size = len + ax25->ax25_dev->dev->hard_header_len;
  
@@ -1549,8 +1547,6 @@
  
 	skb_reserve(skb, size - len);
  
-	SOCK_DEBUG(sk, "AX.25: Appending user data\n");
-
 	/* User data follows immediately after the AX.25 data */
 	if (memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len)) {
 		err = -EFAULT;
@@ -1564,8 +1560,6 @@
 	if (!ax25->pidincl)
 		*skb_push(skb, 1) = sk->sk_protocol;
  
-	SOCK_DEBUG(sk, "AX.25: Transmitting buffer\n");
-
 	if (sk->sk_type == SOCK_SEQPACKET) {
 		/* Connected mode sockets go via the LAPB machine */
 		if (sk->sk_state != TCP_ESTABLISHED) {
  
  
  
@@ -1583,21 +1577,13 @@
  
 	skb_push(skb, 1 + ax25_addr_size(dp));
  
-	SOCK_DEBUG(sk, "Building AX.25 Header (dp=%p).\n", dp);
+	/* Building AX.25 Header */
  
-	if (dp != NULL)
-		SOCK_DEBUG(sk, "Num digipeaters=%d\n", dp->ndigi);
-
 	/* Build an AX.25 header */
 	lv = ax25_addr_build(skb->data, &ax25->source_addr, &sax.sax25_call,
 			     dp, AX25_COMMAND, AX25_MODULUS);
  
-	SOCK_DEBUG(sk, "Built header (%d bytes)\n",lv);
-
 	skb_set_transport_header(skb, lv);
-
-	SOCK_DEBUG(sk, "base=%p pos=%p\n",
-		   skb->data, skb_transport_header(skb));
  
 	*skb_transport_header(skb) = AX25_UI;
  
@@ -591,7 +591,6 @@
 		return -EINVAL;
 	}
 	if ((dev = nr_dev_get(&addr->fsa_ax25.sax25_call)) == NULL) {
-		SOCK_DEBUG(sk, "NET/ROM: bind failed: invalid node callsign\n");
 		release_sock(sk);
 		return -EADDRNOTAVAIL;
 	}
@@ -632,7 +631,7 @@
 	sock_reset_flag(sk, SOCK_ZAPPED);
 	dev_put(dev);
 	release_sock(sk);
-	SOCK_DEBUG(sk, "NET/ROM: socket is bound\n");
+
 	return 0;
 }
  
@@ -1082,8 +1081,6 @@
 		sax.sax25_call   = nr->dest_addr;
 	}
  
-	SOCK_DEBUG(sk, "NET/ROM: sendto: Addresses built.\n");
-
 	/* Build a packet - the conventional user limit is 236 bytes. We can
 	   do ludicrously large NetROM frames but must not overflow */
 	if (len > 65536) {
@@ -1091,7 +1088,6 @@
 		goto out;
 	}
  
-	SOCK_DEBUG(sk, "NET/ROM: sendto: building packet.\n");
 	size = len + NR_NETWORK_LEN + NR_TRANSPORT_LEN;
  
 	if ((skb = sock_alloc_send_skb(sk, size, msg->msg_flags & MSG_DONTWAIT, &err)) == NULL)
@@ -1105,7 +1101,6 @@
 	 */
  
 	asmptr = skb_push(skb, NR_TRANSPORT_LEN);
-	SOCK_DEBUG(sk, "Building NET/ROM Header.\n");
  
 	/* Build a NET/ROM Transport header */
  
  
  
@@ -1114,23 +1109,18 @@
 	*asmptr++ = 0;		/* To be filled in later */
 	*asmptr++ = 0;		/*      Ditto            */
 	*asmptr++ = NR_INFO;
-	SOCK_DEBUG(sk, "Built header.\n");
  
 	/*
 	 *	Put the data on the end
 	 */
 	skb_put(skb, len);
  
-	SOCK_DEBUG(sk, "NET/ROM: Appending user data\n");
-
 	/* User data follows immediately after the NET/ROM transport header */
 	if (memcpy_fromiovec(skb_transport_header(skb), msg->msg_iov, len)) {
 		kfree_skb(skb);
 		err = -EFAULT;
 		goto out;
 	}
-
-	SOCK_DEBUG(sk, "NET/ROM: Transmitting buffer\n");
  
 	if (sk->sk_state != TCP_ESTABLISHED) {
 		kfree_skb(skb);
@@ -682,10 +682,8 @@
 	if ((unsigned int) addr->srose_ndigis > ROSE_MAX_DIGIS)
 		return -EINVAL;
  
-	if ((dev = rose_dev_get(&addr->srose_addr)) == NULL) {
-		SOCK_DEBUG(sk, "ROSE: bind failed: invalid address\n");
+	if ((dev = rose_dev_get(&addr->srose_addr)) == NULL)
 		return -EADDRNOTAVAIL;
-	}
  
 	source = &addr->srose_call;
  
@@ -716,7 +714,7 @@
 	rose_insert_socket(sk);
  
 	sock_reset_flag(sk, SOCK_ZAPPED);
-	SOCK_DEBUG(sk, "ROSE: socket is bound\n");
+
 	return 0;
 }
  
  
@@ -1109,10 +1107,7 @@
 			srose.srose_digis[n] = rose->dest_digis[n];
 	}
  
-	SOCK_DEBUG(sk, "ROSE: sendto: Addresses built.\n");
-
 	/* Build a packet */
-	SOCK_DEBUG(sk, "ROSE: sendto: building packet.\n");
 	/* Sanity check the packet size */
 	if (len > 65535)
 		return -EMSGSIZE;
@@ -1127,7 +1122,6 @@
 	/*
 	 *	Put the data on the end
 	 */
-	SOCK_DEBUG(sk, "ROSE: Appending user data\n");
  
 	skb_reset_transport_header(skb);
 	skb_put(skb, len);
@@ -1152,8 +1146,6 @@
 	 */
 	asmptr = skb_push(skb, ROSE_MIN_LEN);
  
-	SOCK_DEBUG(sk, "ROSE: Building Network Header.\n");
-
 	/* Build a ROSE Network header */
 	asmptr[0] = ((rose->lci >> 8) & 0x0F) | ROSE_GFI;
 	asmptr[1] = (rose->lci >> 0) & 0xFF;
@@ -1161,10 +1153,6 @@
  
 	if (qbit)
 		asmptr[0] |= ROSE_Q_BIT;
-
-	SOCK_DEBUG(sk, "ROSE: Built header.\n");
-
-	SOCK_DEBUG(sk, "ROSE: Transmitting buffer\n");
  
 	if (sk->sk_state != TCP_ESTABLISHED) {
 		kfree_skb(skb);
...	...	@@ -1538,8 +1538,6 @@
1538	1538	}
1539	1539
1540	1540	/* Build a packet */
1541		- SOCK_DEBUG(sk, "AX.25: sendto: Addresses built. Building packet.\n");
1542		-
1543	1541	/* Assume the worst case */
1544	1542	size = len + ax25->ax25_dev->dev->hard_header_len;
1545	1543
...	...	@@ -1549,8 +1547,6 @@
1549	1547
1550	1548	skb_reserve(skb, size - len);
1551	1549
1552		- SOCK_DEBUG(sk, "AX.25: Appending user data\n");
1553		-
1554	1550	/* User data follows immediately after the AX.25 data */
1555	1551	if (memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len)) {
1556	1552	err = -EFAULT;
...	...	@@ -1564,8 +1560,6 @@
1564	1560	if (!ax25->pidincl)
1565	1561	*skb_push(skb, 1) = sk->sk_protocol;
1566	1562
1567		- SOCK_DEBUG(sk, "AX.25: Transmitting buffer\n");
1568		-
1569	1563	if (sk->sk_type == SOCK_SEQPACKET) {
1570	1564	/* Connected mode sockets go via the LAPB machine */
1571	1565	if (sk->sk_state != TCP_ESTABLISHED) {
1572	1566
1573	1567
1574	1568
...	...	@@ -1583,21 +1577,13 @@
1583	1577
1584	1578	skb_push(skb, 1 + ax25_addr_size(dp));
1585	1579
1586		- SOCK_DEBUG(sk, "Building AX.25 Header (dp=%p).\n", dp);
	1580	+ /* Building AX.25 Header */
1587	1581
1588		- if (dp != NULL)
1589		- SOCK_DEBUG(sk, "Num digipeaters=%d\n", dp->ndigi);
1590		-
1591	1582	/* Build an AX.25 header */
1592	1583	lv = ax25_addr_build(skb->data, &ax25->source_addr, &sax.sax25_call,
1593	1584	dp, AX25_COMMAND, AX25_MODULUS);
1594	1585
1595		- SOCK_DEBUG(sk, "Built header (%d bytes)\n",lv);
1596		-
1597	1586	skb_set_transport_header(skb, lv);
1598		-
1599		- SOCK_DEBUG(sk, "base=%p pos=%p\n",
1600		- skb->data, skb_transport_header(skb));
1601	1587
1602	1588	*skb_transport_header(skb) = AX25_UI;
1603	1589
...	...	@@ -591,7 +591,6 @@
591	591	return -EINVAL;
592	592	}
593	593	if ((dev = nr_dev_get(&addr->fsa_ax25.sax25_call)) == NULL) {
594		- SOCK_DEBUG(sk, "NET/ROM: bind failed: invalid node callsign\n");
595	594	release_sock(sk);
596	595	return -EADDRNOTAVAIL;
597	596	}
...	...	@@ -632,7 +631,7 @@
632	631	sock_reset_flag(sk, SOCK_ZAPPED);
633	632	dev_put(dev);
634	633	release_sock(sk);
635		- SOCK_DEBUG(sk, "NET/ROM: socket is bound\n");
	634	+
636	635	return 0;
637	636	}
638	637
...	...	@@ -1082,8 +1081,6 @@
1082	1081	sax.sax25_call = nr->dest_addr;
1083	1082	}
1084	1083
1085		- SOCK_DEBUG(sk, "NET/ROM: sendto: Addresses built.\n");
1086		-
1087	1084	/* Build a packet - the conventional user limit is 236 bytes. We can
1088	1085	do ludicrously large NetROM frames but must not overflow */
1089	1086	if (len > 65536) {
...	...	@@ -1091,7 +1088,6 @@
1091	1088	goto out;
1092	1089	}
1093	1090
1094		- SOCK_DEBUG(sk, "NET/ROM: sendto: building packet.\n");
1095	1091	size = len + NR_NETWORK_LEN + NR_TRANSPORT_LEN;
1096	1092
1097	1093	if ((skb = sock_alloc_send_skb(sk, size, msg->msg_flags & MSG_DONTWAIT, &err)) == NULL)
...	...	@@ -1105,7 +1101,6 @@
1105	1101	*/
1106	1102
1107	1103	asmptr = skb_push(skb, NR_TRANSPORT_LEN);
1108		- SOCK_DEBUG(sk, "Building NET/ROM Header.\n");
1109	1104
1110	1105	/* Build a NET/ROM Transport header */
1111	1106
1112	1107
1113	1108
...	...	@@ -1114,23 +1109,18 @@
1114	1109	asmptr++ = 0; / To be filled in later */
1115	1110	asmptr++ = 0; / Ditto */
1116	1111	*asmptr++ = NR_INFO;
1117		- SOCK_DEBUG(sk, "Built header.\n");
1118	1112
1119	1113	/*
1120	1114	* Put the data on the end
1121	1115	*/
1122	1116	skb_put(skb, len);
1123	1117
1124		- SOCK_DEBUG(sk, "NET/ROM: Appending user data\n");
1125		-
1126	1118	/* User data follows immediately after the NET/ROM transport header */
1127	1119	if (memcpy_fromiovec(skb_transport_header(skb), msg->msg_iov, len)) {
1128	1120	kfree_skb(skb);
1129	1121	err = -EFAULT;
1130	1122	goto out;
1131	1123	}
1132		-
1133		- SOCK_DEBUG(sk, "NET/ROM: Transmitting buffer\n");
1134	1124
1135	1125	if (sk->sk_state != TCP_ESTABLISHED) {
1136	1126	kfree_skb(skb);
...	...	@@ -682,10 +682,8 @@
682	682	if ((unsigned int) addr->srose_ndigis > ROSE_MAX_DIGIS)
683	683	return -EINVAL;
684	684
685		- if ((dev = rose_dev_get(&addr->srose_addr)) == NULL) {
686		- SOCK_DEBUG(sk, "ROSE: bind failed: invalid address\n");
	685	+ if ((dev = rose_dev_get(&addr->srose_addr)) == NULL)
687	686	return -EADDRNOTAVAIL;
688		- }
689	687
690	688	source = &addr->srose_call;
691	689
...	...	@@ -716,7 +714,7 @@
716	714	rose_insert_socket(sk);
717	715
718	716	sock_reset_flag(sk, SOCK_ZAPPED);
719		- SOCK_DEBUG(sk, "ROSE: socket is bound\n");
	717	+
720	718	return 0;
721	719	}
722	720
723	721
...	...	@@ -1109,10 +1107,7 @@
1109	1107	srose.srose_digis[n] = rose->dest_digis[n];
1110	1108	}
1111	1109
1112		- SOCK_DEBUG(sk, "ROSE: sendto: Addresses built.\n");
1113		-
1114	1110	/* Build a packet */
1115		- SOCK_DEBUG(sk, "ROSE: sendto: building packet.\n");
1116	1111	/* Sanity check the packet size */
1117	1112	if (len > 65535)
1118	1113	return -EMSGSIZE;
...	...	@@ -1127,7 +1122,6 @@
1127	1122	/*
1128	1123	* Put the data on the end
1129	1124	*/
1130		- SOCK_DEBUG(sk, "ROSE: Appending user data\n");
1131	1125
1132	1126	skb_reset_transport_header(skb);
1133	1127	skb_put(skb, len);
...	...	@@ -1152,8 +1146,6 @@
1152	1146	*/
1153	1147	asmptr = skb_push(skb, ROSE_MIN_LEN);
1154	1148
1155		- SOCK_DEBUG(sk, "ROSE: Building Network Header.\n");
1156		-
1157	1149	/* Build a ROSE Network header */
1158	1150	asmptr[0] = ((rose->lci >> 8) & 0x0F) \| ROSE_GFI;
1159	1151	asmptr[1] = (rose->lci >> 0) & 0xFF;
...	...	@@ -1161,10 +1153,6 @@
1161	1153
1162	1154	if (qbit)
1163	1155	asmptr[0] \|= ROSE_Q_BIT;
1164		-
1165		- SOCK_DEBUG(sk, "ROSE: Built header.\n");
1166		-
1167		- SOCK_DEBUG(sk, "ROSE: Transmitting buffer\n");
1168	1156
1169	1157	if (sk->sk_state != TCP_ESTABLISHED) {
1170	1158	kfree_skb(skb);