Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Ralf Baechle and committed by
David S. Miller
8849b720 45a5f720

+4 -40
+1 -15
net/ax25/af_ax25.c
··· 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 ··· 1546 1548 goto out; 1547 1549 1548 1550 skb_reserve(skb, size - len); 1549 - 1550 - SOCK_DEBUG(sk, "AX.25: Appending user data\n"); 1551 1551 1552 1552 /* User data follows immediately after the AX.25 data */ 1553 1553 if (memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len)) { ··· 1559 1563 /* Add the PID if one is not supplied by the user in the skb */ 1560 1564 if (!ax25->pidincl) 1561 1565 *skb_push(skb, 1) = sk->sk_protocol; 1562 - 1563 - SOCK_DEBUG(sk, "AX.25: Transmitting buffer\n"); 1564 1566 1565 1567 if (sk->sk_type == SOCK_SEQPACKET) { 1566 1568 /* Connected mode sockets go via the LAPB machine */ ··· 1577 1583 1578 1584 skb_push(skb, 1 + ax25_addr_size(dp)); 1579 1585 1580 - SOCK_DEBUG(sk, "Building AX.25 Header (dp=%p).\n", dp); 1581 - 1582 - if (dp != NULL) 1583 - SOCK_DEBUG(sk, "Num digipeaters=%d\n", dp->ndigi); 1586 + /* Building AX.25 Header */ 1584 1587 1585 1588 /* Build an AX.25 header */ 1586 1589 lv = ax25_addr_build(skb->data, &ax25->source_addr, &sax.sax25_call, 1587 1590 dp, AX25_COMMAND, AX25_MODULUS); 1588 1591 1589 - SOCK_DEBUG(sk, "Built header (%d bytes)\n",lv); 1590 - 1591 1592 skb_set_transport_header(skb, lv); 1592 - 1593 - SOCK_DEBUG(sk, "base=%p pos=%p\n", 1594 - skb->data, skb_transport_header(skb)); 1595 1593 1596 1594 *skb_transport_header(skb) = AX25_UI; 1597 1595
+1 -11
net/netrom/af_netrom.c
··· 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 } ··· 631 632 sock_reset_flag(sk, SOCK_ZAPPED); 632 633 dev_put(dev); 633 634 release_sock(sk); 634 - SOCK_DEBUG(sk, "NET/ROM: socket is bound\n"); 635 + 635 636 return 0; 636 637 } 637 638 ··· 1081 1082 sax.sax25_call = nr->dest_addr; 1082 1083 } 1083 1084 1084 - SOCK_DEBUG(sk, "NET/ROM: sendto: Addresses built.\n"); 1085 - 1086 1085 /* Build a packet - the conventional user limit is 236 bytes. We can 1087 1086 do ludicrously large NetROM frames but must not overflow */ 1088 1087 if (len > 65536) { ··· 1088 1091 goto out; 1089 1092 } 1090 1093 1091 - SOCK_DEBUG(sk, "NET/ROM: sendto: building packet.\n"); 1092 1094 size = len + NR_NETWORK_LEN + NR_TRANSPORT_LEN; 1093 1095 1094 1096 if ((skb = sock_alloc_send_skb(sk, size, msg->msg_flags & MSG_DONTWAIT, &err)) == NULL) ··· 1101 1105 */ 1102 1106 1103 1107 asmptr = skb_push(skb, NR_TRANSPORT_LEN); 1104 - SOCK_DEBUG(sk, "Building NET/ROM Header.\n"); 1105 1108 1106 1109 /* Build a NET/ROM Transport header */ 1107 1110 ··· 1109 1114 *asmptr++ = 0; /* To be filled in later */ 1110 1115 *asmptr++ = 0; /* Ditto */ 1111 1116 *asmptr++ = NR_INFO; 1112 - SOCK_DEBUG(sk, "Built header.\n"); 1113 1117 1114 1118 /* 1115 1119 * Put the data on the end 1116 1120 */ 1117 1121 skb_put(skb, len); 1118 - 1119 - SOCK_DEBUG(sk, "NET/ROM: Appending user data\n"); 1120 1122 1121 1123 /* User data follows immediately after the NET/ROM transport header */ 1122 1124 if (memcpy_fromiovec(skb_transport_header(skb), msg->msg_iov, len)) { ··· 1121 1129 err = -EFAULT; 1122 1130 goto out; 1123 1131 } 1124 - 1125 - SOCK_DEBUG(sk, "NET/ROM: Transmitting buffer\n"); 1126 1132 1127 1133 if (sk->sk_state != TCP_ESTABLISHED) { 1128 1134 kfree_skb(skb);
+2 -14
net/rose/af_rose.c
··· 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 ··· 714 716 rose_insert_socket(sk); 715 717 716 718 sock_reset_flag(sk, SOCK_ZAPPED); 717 - SOCK_DEBUG(sk, "ROSE: socket is bound\n"); 719 + 718 720 return 0; 719 721 } 720 722 ··· 1107 1109 srose.srose_digis[n] = rose->dest_digis[n]; 1108 1110 } 1109 1111 1110 - SOCK_DEBUG(sk, "ROSE: sendto: Addresses built.\n"); 1111 - 1112 1112 /* Build a packet */ 1113 - SOCK_DEBUG(sk, "ROSE: sendto: building packet.\n"); 1114 1113 /* Sanity check the packet size */ 1115 1114 if (len > 65535) 1116 1115 return -EMSGSIZE; ··· 1122 1127 /* 1123 1128 * Put the data on the end 1124 1129 */ 1125 - SOCK_DEBUG(sk, "ROSE: Appending user data\n"); 1126 1130 1127 1131 skb_reset_transport_header(skb); 1128 1132 skb_put(skb, len); ··· 1146 1152 */ 1147 1153 asmptr = skb_push(skb, ROSE_MIN_LEN); 1148 1154 1149 - SOCK_DEBUG(sk, "ROSE: Building Network Header.\n"); 1150 - 1151 1155 /* Build a ROSE Network header */ 1152 1156 asmptr[0] = ((rose->lci >> 8) & 0x0F) | ROSE_GFI; 1153 1157 asmptr[1] = (rose->lci >> 0) & 0xFF; ··· 1153 1161 1154 1162 if (qbit) 1155 1163 asmptr[0] |= ROSE_Q_BIT; 1156 - 1157 - SOCK_DEBUG(sk, "ROSE: Built header.\n"); 1158 - 1159 - SOCK_DEBUG(sk, "ROSE: Transmitting buffer\n"); 1160 1164 1161 1165 if (sk->sk_state != TCP_ESTABLISHED) { 1162 1166 kfree_skb(skb);